(svn r23630) -Add: a Goal GUI to show your current goals

4 files changed, 96 insertions, 0 deletions

diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index 317a0262f..63bb99707 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -320,6 +320,7 @@
     <ClCompile Include="..\src\genworld.cpp" />
     <ClCompile Include="..\src\gfx.cpp" />
     <ClCompile Include="..\src\gfxinit.cpp" />
+    <ClCompile Include="..\src\goal.cpp" />
     <ClCompile Include="..\src\ground_vehicle.cpp" />
     <ClCompile Include="..\src\heightmap.cpp" />
     <ClCompile Include="..\src\highscore.cpp" />
@@ -439,6 +440,8 @@
     <ClInclude Include="..\src\gfx_func.h" />
     <ClInclude Include="..\src\gfx_type.h" />
     <ClInclude Include="..\src\gfxinit.h" />
+    <ClInclude Include="..\src\goal_base.h" />
+    <ClInclude Include="..\src\goal_type.h" />
     <ClInclude Include="..\src\graph_gui.h" />
     <ClInclude Include="..\src\ground_vehicle.hpp" />
     <ClInclude Include="..\src\group.h" />
@@ -650,6 +653,7 @@
     <ClCompile Include="..\src\error_gui.cpp" />
     <ClCompile Include="..\src\fios_gui.cpp" />
     <ClCompile Include="..\src\genworld_gui.cpp" />
+    <ClCompile Include="..\src\goal_gui.cpp" />
     <ClCompile Include="..\src\graph_gui.cpp" />
     <ClCompile Include="..\src\group_gui.cpp" />
     <ClCompile Include="..\src\highscore_gui.cpp" />
@@ -707,6 +711,7 @@
     <ClInclude Include="..\src\widgets\error_widget.h" />
     <ClInclude Include="..\src\widgets\fios_widget.h" />
     <ClInclude Include="..\src\widgets\genworld_widget.h" />
+    <ClInclude Include="..\src\widgets\goal_widget.h" />
     <ClInclude Include="..\src\widgets\graph_widget.h" />
     <ClInclude Include="..\src\widgets\group_widget.h" />
     <ClInclude Include="..\src\widgets\highscore_widget.h" />
@@ -781,6 +786,7 @@
     <ClCompile Include="..\src\saveload\engine_sl.cpp" />
     <ClCompile Include="..\src\saveload\game_sl.cpp" />
     <ClCompile Include="..\src\saveload\gamelog_sl.cpp" />
+    <ClCompile Include="..\src\saveload\goal_sl.cpp" />
     <ClCompile Include="..\src\saveload\group_sl.cpp" />
     <ClCompile Include="..\src\saveload\industry_sl.cpp" />
     <ClCompile Include="..\src\saveload\labelmaps_sl.cpp" />
@@ -946,6 +952,7 @@
     <ClInclude Include="..\src\script\api\script_execmode.hpp" />
     <ClInclude Include="..\src\script\api\script_game.hpp" />
     <ClInclude Include="..\src\script\api\script_gamesettings.hpp" />
+    <ClInclude Include="..\src\script\api\script_goal.hpp" />
     <ClInclude Include="..\src\script\api\script_group.hpp" />
     <ClInclude Include="..\src\script\api\script_grouplist.hpp" />
     <ClInclude Include="..\src\script\api\script_industry.hpp" />
@@ -1003,6 +1010,7 @@
     <ClCompile Include="..\src\script\api\script_execmode.cpp" />
     <ClCompile Include="..\src\script\api\script_game.cpp" />
     <ClCompile Include="..\src\script\api\script_gamesettings.cpp" />
+    <ClCompile Include="..\src\script\api\script_goal.cpp" />
     <ClCompile Include="..\src\script\api\script_group.cpp" />
     <ClCompile Include="..\src\script\api\script_grouplist.cpp" />
     <ClCompile Include="..\src\script\api\script_industry.cpp" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index 8ca3761b6..ff0d59326 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -189,6 +189,9 @@
     <ClCompile Include="..\src\gfxinit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\goal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\ground_vehicle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -546,6 +549,12 @@
     <ClInclude Include="..\src\gfxinit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\goal_base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\goal_type.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\graph_gui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1179,6 +1188,9 @@
     <ClCompile Include="..\src\genworld_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\goal_gui.cpp">
+      <Filter>GUI Source Code</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\graph_gui.cpp">
       <Filter>GUI Source Code</Filter>
     </ClCompile>
@@ -1350,6 +1362,9 @@
     <ClInclude Include="..\src\widgets\genworld_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\widgets\goal_widget.h">
+      <Filter>Widgets</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\widgets\graph_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
@@ -1572,6 +1587,9 @@
     <ClCompile Include="..\src\saveload\gamelog_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\saveload\goal_sl.cpp">
+      <Filter>Save/Load handlers</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\saveload\group_sl.cpp">
       <Filter>Save/Load handlers</Filter>
     </ClCompile>
@@ -2067,6 +2085,9 @@
     <ClInclude Include="..\src\script\api\script_gamesettings.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\script\api\script_goal.hpp">
+      <Filter>Script API</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\script\api\script_group.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
@@ -2238,6 +2259,9 @@
     <ClCompile Include="..\src\script\api\script_gamesettings.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\script\api\script_goal.cpp">
+      <Filter>Script API Implementation</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\script\api\script_group.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 87190c364..aea0f39fd 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -551,6 +551,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\goal.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\ground_vehicle.cpp"
 				>
 			</File>
@@ -1031,6 +1035,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\goal_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\goal_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\graph_gui.h"
 				>
 			</File>
@@ -1883,6 +1895,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\goal_gui.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\graph_gui.cpp"
 				>
 			</File>
@@ -2115,6 +2131,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\widgets\goal_widget.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\widgets\graph_widget.h"
 				>
 			</File>
@@ -2419,6 +2439,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\saveload\goal_sl.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\saveload\group_sl.cpp"
 				>
 			</File>
@@ -3119,6 +3143,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\script\api\script_goal.hpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\script\api\script_group.hpp"
 				>
 			</File>
@@ -3351,6 +3379,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\script\api\script_goal.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\script\api\script_group.cpp"
 				>
 			</File>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index ac42a460f..04b5eb539 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -548,6 +548,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\goal.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\ground_vehicle.cpp"
 				>
 			</File>
@@ -1028,6 +1032,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\goal_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\goal_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\graph_gui.h"
 				>
 			</File>
@@ -1880,6 +1892,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\goal_gui.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\graph_gui.cpp"
 				>
 			</File>
@@ -2112,6 +2128,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\widgets\goal_widget.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\widgets\graph_widget.h"
 				>
 			</File>
@@ -2416,6 +2436,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\saveload\goal_sl.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\saveload\group_sl.cpp"
 				>
 			</File>
@@ -3116,6 +3140,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\script\api\script_goal.hpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\script\api\script_group.hpp"
 				>
 			</File>
@@ -3348,6 +3376,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\script\api\script_goal.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\script\api\script_group.cpp"
 				>
 			</File>