Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master' into osx

  • Loading branch information...
commit 4be30fb9a62f55572c12df287f6551fe24438ebd 2 parents 809cdaa + 91b0b71
@Philbywhizz Philbywhizz authored
Showing with 3,490 additions and 1,414 deletions.
  1. +6 −0 Changelog.txt
  2. +410 −0 application-icon/badge-enlarged-text.svg
  3. +405 −0 application-icon/badge-full.svg
  4. +417 −0 application-icon/badge-notext-extrastars.svg
  5. +340 −0 application-icon/badge-square.svg
  6. +36 −0 application-icon/build.sh
  7. BIN  application-icon/pioneer.ico
  8. BIN  application-icon/pngs/pioneer-128x128.png
  9. BIN  application-icon/pngs/pioneer-16x16.png
  10. BIN  application-icon/pngs/pioneer-22x22.png
  11. BIN  application-icon/pngs/pioneer-24x24.png
  12. BIN  application-icon/pngs/pioneer-256x256.png
  13. BIN  application-icon/pngs/pioneer-32x32.png
  14. BIN  application-icon/pngs/pioneer-40x40.png
  15. BIN  application-icon/pngs/pioneer-48x48.png
  16. BIN  application-icon/pngs/pioneer-64x64.png
  17. +4 −0 configure.ac
  18. +3 −1 data/lang/Polski.txt
  19. +28 −0 data/lang/Spanish.txt
  20. +104 −0 data/modules/Scout/Languages.lua
  21. +2 −0  src/Camera.h
  22. +1 −1  src/DeadVideoLink.cpp
  23. +46 −0 src/DeathView.cpp
  24. +29 −0 src/DeathView.h
  25. +1 −1  src/FaceVideoLink.cpp
  26. +8 −1 src/Game.cpp
  27. +4 −3 src/GameMenuView.cpp
  28. +46 −0 src/LuaDev.cpp
  29. +8 −0 src/LuaDev.h
  30. +11 −0 src/Makefile.am
  31. +26 −20 src/Pi.cpp
  32. +2 −0  src/Pi.h
  33. +2 −2 src/Planet.cpp
  34. +4 −4 src/Sfx.cpp
  35. +119 −24 src/Space.cpp
  36. +102 −103 src/WorldView.cpp
  37. +0 −3  src/WorldView.h
  38. +3 −0  src/galaxy/StarSystem.cpp
  39. +1 −0  src/galaxy/StarSystem.h
  40. +7 −2 src/gui/GuiToolTip.cpp
  41. +3 −2 src/gui/GuiToolTip.h
  42. +11 −11 src/gui/GuiWidget.cpp
  43. +1 −0  src/gui/GuiWidget.h
  44. +4 −0 src/win32/pioneer.rc
  45. BIN  win32/lib/libogg_static_vc2012_debug.lib
  46. BIN  win32/lib/libogg_static_vc2012_debug.pdb
  47. BIN  win32/lib/libogg_static_vc2012_release.lib
  48. BIN  win32/lib/libvorbis_static_vc2012_debug.lib
  49. BIN  win32/lib/libvorbis_static_vc2012_release.lib
  50. BIN  win32/lib/libvorbisfile_static_vc2012_debug.lib
  51. BIN  win32/lib/libvorbisfile_static_vc2012_release.lib
  52. +20 −0 win32/vc2008/pioneer-msvc-9.0.vcproj
  53. +7 −0 win32/vc2010/pioneer.vcxproj
  54. +17 −0 win32/vc2010/pioneer.vcxproj.filters
  55. +402 −398 win32/vc2012/pioneer.vcxproj
  56. +850 −838 win32/vc2012/pioneer.vcxproj.filters
View
6 Changelog.txt
@@ -13,18 +13,23 @@ Alpha 27
* Earth start location has returned to Los Angeles (in daytime now) (#1506)
* Player cash is shown on the 'Personal' page of the Info (F3) screen (#1525, #1500)
* Equipment listed on the Info (F3) screen is split over two columns (#1525, #1527)
+ * Explosions are now slower and more visible (#1543)
+ * Application icon for Windows builds (#1537, #1166)
* Fixes
* Avoid icons in some ternary systems overlapping each other (#1510, #1511)
* Fix overlapping text for long system descriptions (#1494, #1498)
* Fix crash in SystemInfoView from leaking widget references (#1526, #1493)
* Clamp some newer terrain heights to non-negative values (#1534, #1530)
+ * Try to avoid placing starports where they will be covered by mountains (#1503, #7)
+ * Don't pass events through the load/save dialog to the widget below (#1547, #1553)
* Script changes
* EventQueue, which was deprecated in alpha 26, has been removed (#1485)
* Orbital phase (season) and rotational phase (time) can now be set in custom
systems with :rotational_phase_at_start and :orbital_phase_at_start (#1506)
* Thruster values in ship definitions are now all positive (#1536)
+ * New function Dev.SetCameraOffset to help find good cockpit camera offsets (#1130)
* Internal changes
* Terrain generation thread now sleeps until being signalled (#1169)
@@ -36,6 +41,7 @@ Alpha 27
* Code to detect supported video modes has moved to Graphics (#1535, #1385)
* Cleaned up UI view code for consistency and stability (#1528)
* Removed duplication in key bindings code (#1545)
+ * New view (DeathView) to deal with display after the player dies (#1543, #1540)
Alpha 26
View
410 application-icon/badge-enlarged-text.svg
410 additions, 0 deletions not shown
View
405 application-icon/badge-full.svg
405 additions, 0 deletions not shown
View
417 application-icon/badge-notext-extrastars.svg
417 additions, 0 deletions not shown
View
340 application-icon/badge-square.svg
340 additions, 0 deletions not shown
View
36 application-icon/build.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+FLAGS='--export-area-page --export-background="#000000" --export-background-opacity=0.0 --without-gui'
+
+png_name() {
+ for sz in $*; do
+ printf 'pngs/pioneer-%dx%d.png\n' "$sz" "$sz"
+ done
+}
+
+build_png() {
+ SIZE=$1
+ SVG=$2
+ OUTFILE="$(png_name "$SIZE")"
+ test "$SVG" -nt "$OUTFILE" || return 0
+ printf 'Generating %sx%s PNG from %s\n' $SIZE $SIZE "$SVG"
+ inkscape --export-png="$OUTFILE" -w$SIZE -h$SIZE $FLAGS "$SVG"
+ optipng -clobber "$OUTFILE"
+}
+
+test -d pngs || mkdir pngs
+build_png 256 badge-enlarged-text.svg
+build_png 128 badge-enlarged-text.svg
+build_png 64 badge-notext-extrastars.svg
+build_png 48 badge-notext-extrastars.svg
+build_png 40 badge-notext-extrastars.svg
+build_png 32 badge-notext-extrastars.svg
+build_png 24 badge-square.svg
+build_png 22 badge-square.svg
+build_png 16 badge-square.svg
+
+sizes="16 24 32 48 64 256"
+names="$(png_name $sizes)"
+CMD="icotool --create --icon --output=pioneer.ico $names"
+printf 'running %s\n' "$CMD"
+$CMD
View
BIN  application-icon/pioneer.ico
Binary file not shown
View
BIN  application-icon/pngs/pioneer-128x128.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-16x16.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-22x22.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-24x24.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-256x256.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-32x32.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-40x40.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-48x48.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  application-icon/pngs/pioneer-64x64.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 configure.ac
@@ -32,11 +32,15 @@ AC_DEFUN([MXE_SETUP], [
host_alias=i686-pc-mingw32
ac_tool_prefix=$host_alias-
cross_compiling=yes
+ HAVE_WINDRES=yes
+ MXE_WINDRES="$MXE_BASE/usr/bin/${ac_tool_prefix}windres"
fi
+ AM_CONDITIONAL([HAVE_WINDRES], [test "$HAVE_WINDRES" = yes])
AC_SUBST(MXE_BASE)
AC_SUBST(MXE_CROSS)
AC_SUBST(MXE_PATH)
AC_SUBST(MXE_CMAKE_TOOLCHAIN_FILE)
+ AC_SUBST(MXE_WINDRES)
])
MXE_SETUP
View
4 data/lang/Polski.txt
@@ -1253,4 +1253,6 @@ MONTH_OCT
MONTH_NOV
Lis
MONTH_DEC
- Gru
+ Gru
+MISCELLANEOUS
+ Różne
View
28 data/lang/Spanish.txt
@@ -220,6 +220,8 @@ WINDOW_OR_FULLSCREEN
Ventana o Pantalla completa (Reiniciar para aplicar)
FULL_SCREEN
Pantalla completa
+COMPRESS_TEXTURES
+ Comprimir Texturas
OTHER_GRAPHICS_SETTINGS
Otras opciones gráficas
USE_SHADERS
@@ -744,14 +746,38 @@ SHIP_IS_FULLY_LADEN
Su nave está completamente cargada.
YOU_DO_NOT_HAVE_ANY_X
No dispone de %item.
+FRONT_COCKPIT_VIEW
+ Vista frontal de la cabina
+REAR_COCKPIT_VIEW
+ Vista trasera de la cabina
CAMERA_FRONT_VIEW
Vista frontal
CAMERA_REAR_VIEW
Vista trasera
+CAMERA_LEFT_VIEW
+ Vista izquierda
+CAMERA_TOP_VIEW
+ Vista superior
+CAMERA_RIGHT_VIEW
+ Vista derecha
+CAMERA_BOTTOM_VIEW
+ Vista inferior
+INTERNAL_VIEW
+ Vista interior
EXTERNAL_VIEW
Vista externa
SIDEREAL_VIEW
Vista sideral
+ROTATE_UP
+ Rotar arriba
+ROTATE_DOWN
+ Rotar abajo
+ROTATE_LEFT
+ Rotar izquierda
+ROTATE_RIGHT
+ Rotar derecha
+RESET
+ Reset
NAVIGATION_STAR_MAPS
Navegación y mapas estelares
COMMS
@@ -1228,3 +1254,5 @@ MONTH_NOV
Nov
MONTH_DEC
Dic
+MISCELLANEOUS
+ Miscelaneos
View
104 data/modules/Scout/Languages.lua
@@ -113,3 +113,107 @@ Translate:Add({ English = {
"You won't get back with that sensor data!",
},
}, })
+
+ ---- POLISH / POLSKI ----
+
+Translate:AddFlavour('Polski','Scout', {
+ adtext = "Poszukuję Pilota dla rekonesansu w systemie {system}",
+ introtext = "Witam, nazywam się {name}. Odbieramy jakieś sygnały niedaleko {systembody} w systemie {system} ({sectorx}, {sectory}, {sectorz}). Upoważniono mnie do wypłacenia {cash} za skanowanie sensorem w tym obszarze.",
+ whysomuchtext = "To standardowa zapłata za taką usługę.",
+ successmsg = "Dziękuję ci za transmisję informacji. Uzgodniona kwota będzie przelana na twoje konto",
+ failuremsg = "Z twojej winy zrywamy kontrakt, musieliśmy wysłać kolejny statek. Odnotujemy twoją niekompetencję!",
+ urgency = 0,
+ risk = 0,
+ localscout = 0,
+})
+
+Translate:AddFlavour('Polski','Scout', {
+ adtext = "Potrzebny zwiadowca do systemu {system}.",
+ introtext = "Witam. Jestem {name}. Zapłacę ci {cash} za skanowanie sensorem niedaleko {systembody} w systemie {system} ({sectorx}, {sectory}, {sectorz}).",
+ whysomuchtext = "Jeśli chcesz to mogę zaoferować ci mniej...?",
+ successmsg = "Odebraliśmy twoje dane, za chwilę otrzymasz pieniądze.",
+ failuremsg = "Równie dobrze można było wysłać tam ślimaka. Nie zapłacę za przestarzałe informacje!",
+ urgency = 0.1,
+ risk = 0,
+ localscout = 0,
+})
+
+Translate:AddFlavour('Polski','Scout', {
+ adtext = "PILNE. Potrzebne dane o systemie {system}!",
+ introtext = "Nazywam się {name}, jestem dziennikarzem i właśnie piszę materiał o systemie {system} ({sectorx}, {sectory}, {sectorz}). Potrzebuję zweryfikować niektóre wątki dotyczące okolic {systembody}. Mogę zapłacić {cash} każdemu, kto dostarczy mi te dane jeszcze przed ostatecznym terminem druku.",
+ whysomuchtext = "Jestem znanym dziennikarzem, ale nie z tych pragnących pisać dla brukowców. Bo wiem że prawdziwe informacje są w cenie.",
+ successmsg = "Wielkie dzięki, właśnie takiego materiału źródłowego szukam do mojego artykułu. Twoje pieniądze są już w drodze!",
+ failuremsg = "Artykuł nie został ukończony na czas ponieważ brakło podparcia dla niektórych z kwestii. Brak pieniędzy dla mnie, brak też pieniędzy dla ciebie.",
+ urgency = 0.6,
+ risk = 0,
+ localscout = 0,
+})
+
+Translate:AddFlavour('Polski','Scout', {
+ adtext = "REKONESANS. W systemie {system} . {cash} dla doświadczonego pilota.",
+ introtext = "Witam. Jestem {name}, dla mnie informacja to pieniądz. Mogę zapłacić {cash} za skanowanie sensorem nad {systembody} w systemie {system} ({sectorx}, {sectory}, {sectorz}).",
+ whysomuchtext = "Wiem że coś tam się dzieje, ale nie wiem dokładnie co. W mojej profesji, to niedopuszczalne.",
+ successmsg = "Twoja punktualna i dyskretna usługa zostanie doceniona. Wypłacam całą należność.",
+ failuremsg = "Nieprzydatne! Więcej liczyć na ciebie nie będę! Nie ma co więcej mówić, nie zapłacę ci za to.",
+ urgency = 0.4,
+ risk = 0.75,
+ localscout = 0,
+})
+
+Translate:AddFlavour('Polski','Scout', {
+ adtext = "Pomóż nam utrzymać porządek w systemie {system}!",
+ introtext = "Pozdrawiam. Tu porucznik {name} ze służby ochrony AdAstra. Zapłacimy {cash} za dane o {systembody} w systemie {system} ({sectorx}, {sectory}, {sectorz}).",
+ whysomuchtext = "Musimy sprawdzić pewne pogłoski. Zwykle okazują się nieistotne, ale czasem mogą być też prawdziwe.",
+ successmsg = "Świetnie, twoje wynagrodzenie będzie przelane.",
+ failuremsg = "Twój numer rejestracyjny zostaje zapisany, będziemy odrzucać twoje dalsze podania o pracę.",
+ urgency = 0.1,
+ risk = 0.1,
+ localscout = 0,
+})
+
+Translate:AddFlavour('Polski','Scout', {
+ adtext = "Biura administracji w {system} potrzebują twojej pomocy przy aktualizacji dokumentacji!",
+ introtext = "Miło cię widzieć, jestem {name}, sekretarz w administracji {system}. Chcę zapłacić {cash} za aktualne dane o {systembody}. Bez pośpiechu, po prostu musimy posiadać aktualną dokumentację.",
+ whysomuchtext = "To jest praca rządowa. To nie są NASZE pieniądze.",
+ successmsg = "Dziękuję ci za pomoc w uzyskaniu aktualnych informacji. Twoja należność została przelana zgodnie z obietnicą.",
+ failuremsg = "Mam uaktualniać nasze przedawnione informacje inną przedawnioną informacją? Obawiam się że jest to niedopuszczalne.",
+ urgency = 0.1,
+ risk = 0,
+ localscout = 1,
+})
+
+Translate:AddFlavour('Polski','Scout', {
+ adtext = "Policja w {system} potrzebuje twojej pomocy w utrzymaniu porządku!",
+ introtext = "Jestem kapitan {name}, policja {system} . Potrzebujemy pilnie informacji o {systembody}. Zapłacę ci {cash} jeśli uzyskam informacje w rozsądnym czasie.",
+ whysomuchtext = "Nie pozwalamy by w sąsiedztwie powstawało zagrożenie dla naszych obywateli . Chcemy wiedzieć co tam się dzieje i musimy wiedzieć to wkrótce!",
+ successmsg = "Twoje szybkie sprawozdanie jest cenne. Twoje pieniądze zostaną przelane.",
+ failuremsg = "Ta informacja była potrzebna dawno temu! Odmawiam zapłaty.",
+ urgency = 0.6,
+ risk = 0.4,
+ localscout = 1,
+})
+
+Translate:Add({ Polski = {
+ ["I suspect that there is some unregistered activity going on. Nothing big probably, but you'd better be prepared."] = "Podejrzewam tam jakąś niezarejestrowaną działalność. Prawdopodobnie nic wielkiego, ale lepiej być przygotowanym.",
+ ["This is just a routine check. If there was a substantial risk, I think we would have heard of attacks in the area."] = "To tylko rutynowa kontrola. Jeżeli istniałoby faktycznie ryzyko, sądzę że usłyszelibyśmy o atakach w tym rejonie.",
+ ["A ship has vanished in the area. I suspect pirate activity."] = "W rejonie przepadł statek. Podejrzewam działalność pirata.",
+ ["Several ships have been lost in the area, including my last scout. I really need to know what's going on."] = "Kilka statków zaginęło w tym rejonie, włącznie z moim ostatnim zwiadowcą. Naprawdę muszę wiedzieć co się dzieje.",
+ ["I have reports from passing ships that confirm pirate attacks. What I need to know is how strong they are. You are certain to meet hostiles."] = "Mam sprawozdania od przelatujących tam statków co potwierdzają ataki pirata. Stąd wiem jak bardzo jest silny. Możesz być pewny zagrożenia.",
+ ["I need the information by "] = "Potrzebuję informacji do ",
+ ["Recon"] = "Rekonesans",
+ ["Excellent. I will await your report."] = "Wspaniale. Oczekuję na twój raport.",
+ ["Why so much money?"] = "Dlaczego tyle pieniędzy?",
+ ["When do you need the data?"] = "Do kiedy potrzebujesz tych danych?",
+ ["Will I be in any danger?"] = "Jest jakieś zagrożenie?",
+ ["Could you repeat the original request?"] = "Możesz powtórzyć swoją ofertę?",
+ ["Ok, agreed."] = "Zgoda.",
+ ["Distance reached, starting long range sensor sweep. Maintain orbit for at least 60 minutes"] = "Dystans osiągnięty, rozpoczęto skanowanie sensorem dalekiego zasięgu. Utrzymaj orbitę przynajmniej 60 minut",
+ ["Sensor sweep interrupted, too far from target!"] = "Przerwano skanowanie sensorem, zbyt daleko od celu!",
+ ["Sensor sweep complete, data stored."] = "Skanowanie sensorem zakończone, zebrano dane.",
+ ["computer"] = "komputer",
+ PIRATE_TAUNTS = {
+ "Co my tu mamy, to dzień zapłaty!",
+ "Cały twój statek należy do nas!",
+ "Nie wrócisz z danymi z tego sensora!",
+ },
+}, })
View
2  src/Camera.h
@@ -57,6 +57,8 @@ class Camera {
// get the frustum. use for projection
const Graphics::Frustum &GetFrustum() const { return m_frustum; }
+ void SetBodyVisible(bool v) { m_showCameraBody = v; }
+
protected:
bool m_showCameraBody;
View
2  src/DeadVideoLink.cpp
@@ -10,7 +10,7 @@ static const int textureSize = 512;
DeadVideoLink::DeadVideoLink(float w, float h) : VideoLink(w, h)
{
m_created = SDL_GetTicks();
- m_message = new Gui::ToolTip(Lang::VID_LINK_DOWN);
+ m_message = new Gui::ToolTip(0, Lang::VID_LINK_DOWN);
Graphics::TextureDescriptor descriptor(Graphics::TEXTURE_RGB, vector2f(textureSize), Graphics::LINEAR_CLAMP);
m_texture.Reset(Gui::Screen::GetRenderer()->CreateTexture(descriptor));
View
46 src/DeathView.cpp
@@ -0,0 +1,46 @@
+// Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
+#include "DeathView.h"
+#include "Pi.h"
+#include "Player.h"
+#include "ShipCpanel.h"
+
+DeathView::DeathView(): View()
+{
+ float size[2];
+ GetSizeRequested(size);
+
+ SetTransparency(true);
+
+ float znear;
+ float zfar;
+ Pi::renderer->GetNearFarRange(znear, zfar);
+
+ const float fovY = Pi::config->Float("FOVVertical");
+ m_cam = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), fovY, znear, zfar);
+}
+
+DeathView::~DeathView() {}
+
+void DeathView::OnSwitchTo()
+{
+ m_cameraDist = Pi::player->GetBoundingRadius() * 5.0;
+ m_cam->SetPosition(vector3d(0, 0, m_cameraDist));
+ m_cam->SetOrientation(matrix4x4d::Identity());
+ Pi::cpan->HideAll();
+}
+
+void DeathView::Update()
+{
+ assert(Pi::player->IsDead());
+
+ m_cameraDist += 160.0 * Pi::GetFrameTime();
+ m_cam->SetPosition(vector3d(0, 0, m_cameraDist));
+ m_cam->Update();
+}
+
+void DeathView::Draw3D()
+{
+ m_cam->Draw(m_renderer);
+}
View
29 src/DeathView.h
@@ -0,0 +1,29 @@
+// Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
+#ifndef DEATH_VIEW_H
+#define DEATH_VIEW_H
+
+#include "libs.h"
+#include "View.h"
+#include "Camera.h"
+
+class DeathView : public View {
+public:
+ DeathView();
+ virtual ~DeathView();
+
+ void Init(float camera_distance);
+
+ virtual void Update();
+ virtual void Draw3D();
+
+protected:
+ virtual void OnSwitchTo();
+
+private:
+ Camera *m_cam;
+ float m_cameraDist;
+};
+
+#endif
View
2  src/FaceVideoLink.cpp
@@ -53,7 +53,7 @@ FaceVideoLink::FaceVideoLink(float w, float h, Uint32 flags, Uint32 seed,
const std::string &name, const std::string &title) : VideoLink(w, h)
{
m_created = SDL_GetTicks();
- m_message = new Gui::ToolTip(Lang::VID_LINK_ESTABLISHED);
+ m_message = new Gui::ToolTip(0, Lang::VID_LINK_ESTABLISHED);
if (!seed) seed = time(NULL);
MTRand rand(seed);
View
9 src/Game.cpp
@@ -13,6 +13,7 @@
#include "MathUtil.h"
#include "SectorView.h"
#include "WorldView.h"
+#include "DeathView.h"
#include "GalacticView.h"
#include "SystemView.h"
#include "SystemInfoView.h"
@@ -22,7 +23,7 @@
#include "ObjectViewerView.h"
#include "graphics/Renderer.h"
-static const int s_saveVersion = 52;
+static const int s_saveVersion = 54;
static const char s_saveStart[] = "PIONEER";
static const char s_saveEnd[] = "END";
@@ -617,6 +618,7 @@ void Game::CreateViews()
Pi::systemInfoView = new SystemInfoView();
Pi::spaceStationView = new SpaceStationView();
Pi::infoView = new InfoView();
+ Pi::deathView = new DeathView();
// view manager will handle setting this probably
Pi::galacticView->SetRenderer(Pi::renderer);
@@ -625,6 +627,7 @@ void Game::CreateViews()
Pi::systemInfoView->SetRenderer(Pi::renderer);
Pi::systemView->SetRenderer(Pi::renderer);
Pi::worldView->SetRenderer(Pi::renderer);
+ Pi::deathView->SetRenderer(Pi::renderer);
#if WITH_OBJECTVIEWER
Pi::objectViewerView = new ObjectViewerView();
@@ -655,6 +658,7 @@ void Game::LoadViews(Serializer::Reader &rd)
Pi::systemInfoView = new SystemInfoView();
Pi::spaceStationView = new SpaceStationView();
Pi::infoView = new InfoView();
+ Pi::deathView = new DeathView();
#if WITH_OBJECTVIEWER
Pi::objectViewerView = new ObjectViewerView();
@@ -667,6 +671,7 @@ void Game::LoadViews(Serializer::Reader &rd)
Pi::systemInfoView->SetRenderer(Pi::renderer);
Pi::systemView->SetRenderer(Pi::renderer);
Pi::worldView->SetRenderer(Pi::renderer);
+ Pi::deathView->SetRenderer(Pi::renderer);
}
void Game::DestroyViews()
@@ -677,6 +682,7 @@ void Game::DestroyViews()
delete Pi::objectViewerView;
#endif
+ delete Pi::deathView;
delete Pi::infoView;
delete Pi::spaceStationView;
delete Pi::systemInfoView;
@@ -687,6 +693,7 @@ void Game::DestroyViews()
delete Pi::cpan;
Pi::objectViewerView = 0;
+ Pi::deathView = 0;
Pi::infoView = 0;
Pi::spaceStationView = 0;
Pi::systemInfoView = 0;
View
7 src/GameMenuView.cpp
@@ -31,7 +31,7 @@ class KeyGetter: public Gui::Fixed {
void OnClickChange() {
if (m_infoTooltip) return;
std::string msg = Lang::PRESS_BUTTON_WANTED_FOR + m_function;
- Gui::ToolTip *t = new Gui::ToolTip(msg);
+ Gui::ToolTip *t = new Gui::ToolTip(this, msg);
Gui::Screen::AddBaseWidget(t, 300, 300);
t->Show();
t->GrabFocus();
@@ -108,7 +108,7 @@ class AxisGetter: public Gui::Fixed {
void OnClickChange() {
if (m_infoTooltip) return;
std::string msg = Lang::MOVE_AXIS_WANTED_FOR + m_function;
- Gui::ToolTip *t = new Gui::ToolTip(msg);
+ Gui::ToolTip *t = new Gui::ToolTip(this, msg);
Gui::Screen::AddBaseWidget(t, 300, 300);
t->Show();
t->GrabFocus();
@@ -643,9 +643,10 @@ void GameMenuView::OpenSaveDialog()
Pi::cpan->MsgLog()->Message("", Lang::CANT_SAVE_IN_HYPERSPACE);
return;
}
-
+ HideAll();
GameSaver saver(Pi::game);
saver.DialogMainLoop();
+ ShowAll();
const std::string filename = saver.GetFilename();
if (!filename.empty())
Pi::cpan->MsgLog()->Message("", Lang::GAME_SAVED_TO+filename);
View
46 src/LuaDev.cpp
@@ -0,0 +1,46 @@
+#include "LuaDev.h"
+#include "LuaObject.h"
+#include "Pi.h"
+#include "WorldView.h"
+
+/*
+ * Lua commands used in development & debugging
+ * Everything here is subject to rapid changes
+ */
+
+/*
+ * Set current camera offset to vector,
+ * it will also make the camera body visible
+ * (the offset will reset when switching cameras)
+ *
+ * Dev.SetCameraOffset(x, y, z)
+ */
+static int l_dev_set_camera_offset(lua_State *l)
+{
+ if (!Pi::worldView)
+ return luaL_error(l, "Dev.SetCameraOffset only works when there is a game running");
+ Camera *cam = Pi::worldView->GetActiveCamera();
+ const float x = luaL_checknumber(l, 1);
+ const float y = luaL_checknumber(l, 2);
+ const float z = luaL_checknumber(l, 3);
+ cam->SetPosition(vector3d(x, y, z));
+ cam->SetBodyVisible(true);
+ return 0;
+}
+
+void LuaDev::Register()
+{
+ lua_State *l = Lua::manager->GetLuaState();
+
+ LUA_DEBUG_START(l);
+
+ static const luaL_Reg methods[]= {
+ { "SetCameraOffset", l_dev_set_camera_offset },
+ { 0, 0 }
+ };
+
+ luaL_newlib(l, methods);
+ lua_setglobal(l, "Dev");
+
+ LUA_DEBUG_END(l, 0);
+}
View
8 src/LuaDev.h
@@ -0,0 +1,8 @@
+#ifndef _LUADEV_H
+#define _LUADEV_H
+
+namespace LuaDev {
+ void Register();
+}
+
+#endif
View
11 src/Makefile.am
@@ -31,6 +31,7 @@ noinst_HEADERS = \
CommodityTradeWidget.h \
CRC32.h \
DeadVideoLink.h \
+ DeathView.h \
DeleteEmitter.h \
DynamicBody.h \
EquipSet.h \
@@ -63,6 +64,7 @@ noinst_HEADERS = \
LuaComms.h \
LuaConsole.h \
LuaConstants.h \
+ LuaDev.h \
LuaEngine.h \
LuaEquipType.h \
LuaEvent.h \
@@ -173,6 +175,7 @@ pioneer_SOURCES = \
CommodityTradeWidget.cpp \
CRC32.cpp \
DeadVideoLink.cpp \
+ DeathView.cpp \
DynamicBody.cpp \
EquipType.cpp \
FaceVideoLink.cpp \
@@ -202,6 +205,7 @@ pioneer_SOURCES = \
LuaComms.cpp \
LuaConsole.cpp \
LuaConstants.cpp \
+ LuaDev.cpp \
LuaEngine.cpp \
LuaEquipType.cpp \
LuaEvent.cpp \
@@ -381,3 +385,10 @@ if BUILD_POSIX
modelviewer_LDADD += posix/libposix.a
endif
+if HAVE_WINDRES
+# note: this can't be correctly packed into libwin32.a
+SUFFIXES = .rc
+pioneer_SOURCES += win32/pioneer.rc
+.rc.o:
+ $(AM_V_GEN)$(MXE_WINDRES) $< $@
+endif
View
46 src/Pi.cpp
@@ -18,6 +18,7 @@
#include "Lang.h"
#include "LmrModel.h"
#include "LuaManager.h"
+#include "LuaDev.h"
#include "LuaRef.h"
#include "LuaBody.h"
#include "LuaCargoBody.h"
@@ -70,6 +71,7 @@
#include "SystemInfoView.h"
#include "SystemView.h"
#include "WorldView.h"
+#include "DeathView.h"
#include "galaxy/CustomSystem.h"
#include "galaxy/Galaxy.h"
#include "galaxy/StarSystem.h"
@@ -103,6 +105,7 @@ bool Pi::doingMouseGrab = false;
Player *Pi::player;
View *Pi::currentView;
WorldView *Pi::worldView;
+DeathView *Pi::deathView;
SpaceStationView *Pi::spaceStationView;
InfoView *Pi::infoView;
SectorView *Pi::sectorView;
@@ -209,7 +212,7 @@ static void LuaInit()
LuaFormat::Register();
LuaSpace::Register();
LuaMusic::Register();
-
+ LuaDev::Register();
LuaConsole::Register();
// XXX load everything. for now, just modules
@@ -761,8 +764,6 @@ void Pi::TombStoneLoop()
{
Uint32 last_time = SDL_GetTicks();
float _time = 0;
- cpan->HideAll();
- currentView->HideAll();
do {
Pi::renderer->BeginFrame();
Pi::renderer->SetPerspectiveProjection(75, Pi::GetScrAspect(), 1.f, 10000.f);
@@ -921,8 +922,10 @@ void Pi::HandleMenuKey(int n)
case 4: // Load game
{
+ menu->HideAll();
GameLoader loader;
loader.DialogMainLoop();
+ menu->ShowAll();
game = loader.GetGame();
if (! game) {
// loading screen was cancelled;
@@ -1130,6 +1133,23 @@ void Pi::MainLoop()
}
frame_stat++;
+ // fuckadoodledoo, did the player die?
+ if (Pi::player->IsDead()) {
+ if (time_player_died > 0.0) {
+ if (Pi::game->GetTime() - time_player_died > 8.0) {
+ Pi::SetView(0);
+ Pi::TombStoneLoop();
+ Pi::EndGame();
+ break;
+ }
+ } else {
+ Pi::game->SetTimeAccel(Game::TIMEACCEL_1X);
+ Pi::SetView(Pi::deathView);
+ Pi::player->Disable();
+ time_player_died = Pi::game->GetTime();
+ }
+ }
+
Pi::renderer->BeginFrame();
Pi::renderer->SetTransform(matrix4x4f::Identity());
@@ -1171,24 +1191,10 @@ void Pi::MainLoop()
return;
if (Pi::game->UpdateTimeAccel())
- accumulator = 0; // fix for huge pauses 10000x -> 1x
+ accumulator = 0; // fix for huge pauses 10000x -> 1x
- // fuckadoodledoo, did the player die?
- if (Pi::player->IsDead()) {
- if (time_player_died > 0.0) {
- if (Pi::game->GetTime() - time_player_died > 8.0) {
- Pi::TombStoneLoop();
- Pi::EndGame();
- break;
- }
- } else {
- Pi::game->SetTimeAccel(Game::TIMEACCEL_1X);
- Pi::cpan->HideAll();
- Pi::SetView(static_cast<View*>(Pi::worldView));
- Pi::player->Disable();
- time_player_died = Pi::game->GetTime();
- }
- } else {
+ if (!Pi::player->IsDead()) {
+ // XXX should this really be limited to while the player is alive?
// this is something we need not do every turn...
if (!config->Int("DisableSound")) AmbientSounds::Update();
StarSystem::ShrinkCache();
View
2  src/Pi.h
@@ -22,6 +22,7 @@ class View;
class SectorView;
class SystemView;
class WorldView;
+class DeathView;
class SystemInfoView;
class ShipCpanel;
class StarSystem;
@@ -130,6 +131,7 @@ class Pi {
static SystemInfoView *systemInfoView;
static SystemView *systemView;
static WorldView *worldView;
+ static DeathView *deathView;
static SpaceStationView *spaceStationView;
static InfoView *infoView;
static LuaConsole *luaConsole;
View
4 src/Planet.cpp
@@ -238,8 +238,8 @@ void Planet::DrawAtmosphere(Renderer *renderer, const vector3d &camPos)
invViewRot.ClearToRotOnly();
invViewRot = invViewRot.InverseOf();
- //XXX this is always 1
- const int numLights = Pi::worldView->GetNumLights();
+ // XXX used to be Pi::worldView->GetNumLights, but that always returns 1
+ const int numLights = 1;
assert(numLights < 4);
vector3d lightDir[4];
float lightCol[4][4];
View
8 src/Sfx.cpp
@@ -84,7 +84,7 @@ void Sfx::TimeStepUpdate(const float timeStep)
switch (m_type) {
case TYPE_EXPLOSION:
- if (m_age > 0.2) m_type = TYPE_NONE;
+ if (m_age > 0.5) m_type = TYPE_NONE;
break;
case TYPE_DAMAGE:
if (m_age > 2.0) m_type = TYPE_NONE;
@@ -106,14 +106,14 @@ void Sfx::Render(Renderer *renderer, const matrix4x4d &ftransform)
trans.Translate(fpos.x, fpos.y, fpos.z);
RefCountedPtr<Material> exmat = Sfx::explosionEffect->GetMaterial();
exmat->diffuse = Color(1.f, 1.f, 0.5f, 1.f);
- renderer->SetTransform(trans * matrix4x4f::ScaleMatrix(1000*m_age));
+ renderer->SetTransform(trans * matrix4x4f::ScaleMatrix(500*m_age));
Sfx::explosionEffect->Draw(renderer);
renderer->SetBlendMode(BLEND_ALPHA);
exmat->diffuse = Color(1.f, 0.5f, 0.f, 0.66f);
- renderer->SetTransform(trans * matrix4x4f::ScaleMatrix(1500*m_age));
+ renderer->SetTransform(trans * matrix4x4f::ScaleMatrix(750*m_age));
Sfx::explosionEffect->Draw(renderer);
exmat->diffuse = Color(1.f, 0.f, 0.f, 0.33f);
- renderer->SetTransform(trans * matrix4x4f::ScaleMatrix(2000*m_age));
+ renderer->SetTransform(trans * matrix4x4f::ScaleMatrix(1000*m_age));
Sfx::explosionEffect->Draw(renderer);
glPopMatrix();
break;
View
143 src/Space.cpp
@@ -334,6 +334,121 @@ Frame *Space::GetFrameWithSystemBody(const SystemBody *b) const
return find_frame_with_sbody(m_rootFrame.Get(), b);
}
+static void RelocateStarportIfUnderwaterOrBuried(SystemBody *sbody, Frame *frame, Planet *planet, vector3d &pos, matrix4x4d &rot)
+{
+ const double radius = planet->GetSystemBody()->GetRadius();
+
+ // suggested position
+ rot = sbody->orbit.rotMatrix;
+ pos = rot * vector3d(0,1,0);
+
+ // Check if height varies too much around the starport center
+ // by sampling 6 points around it. try upto 100 new positions randomly until a match is found
+ // this is not guaranteed to find a match but greatly increases the chancessteroids which are not too steep.
+
+ bool variationWithinLimits = true;
+ double bestVariation = 1e10; // any high value
+ matrix4x4d rotNotUnderwaterWithLeastVariation = rot;
+ vector3d posNotUnderwaterWithLeastVariation = pos;
+ const double heightVariationCheckThreshold = 0.008; // max variation to radius radius ratio to check for local slope, ganymede is around 0.01
+ const double terrainHeightVariation = planet->GetGeoSphere()->GetMaxFeatureHeight(); //in radii
+
+ //printf("%s: terrain height variation %f\n", sbody->name.c_str(), terrainHeightVariation);
+
+ // 6 points are sampled around the starport center by adding/subtracting delta to to coords
+ // points must stay within max height variation to be accepted
+ // 1. delta should be chosen such that it a distance from the starport center that encloses landing pads for the largest starport
+ // 2. maxSlope should be set so maxHeightVariation is less than the height of the landing pads
+ const double delta = 20.0/radius; // in radii
+ const double maxSlope = 0.2; // 0.0 to 1.0
+ const double maxHeightVariation = maxSlope*delta*radius; // in m
+
+ matrix4x4d rot_ = rot;
+ vector3d pos_ = pos;
+
+ bool manualRelocationIsEasy = !(planet->GetSystemBody()->type == SystemBody::TYPE_PLANET_ASTEROID || terrainHeightVariation > heightVariationCheckThreshold);
+
+ // warn and leave it up to the user to relocate custom starports when it's easy to relocate manually, i.e. not on asteroids and other planets which are likely to have high variation in a lot of places
+ const bool isRelocatableIfBuried = !(sbody->isCustomBody && manualRelocationIsEasy);
+
+ bool isInitiallyUnderwater;
+ bool initialVariationTooHigh;
+
+ MTRand r(sbody->seed);
+
+ for (int tries = 0; tries < 200; tries++) {
+ variationWithinLimits = true;
+
+ const double height = planet->GetTerrainHeight(pos_) - radius; // in m
+
+ // check height at 6 points around the starport center stays within variation tolerances
+ // GetHeight gives a varying height field in 3 dimensions.
+ // Given it's smoothly varying it's fine to sample it in arbitary directions to get an idea of how sharply it varies
+ double v[6];
+ v[0] = fabs(planet->GetTerrainHeight(vector3d(pos_.x+delta, pos_.y, pos_.z))-radius-height);
+ v[1] = fabs(planet->GetTerrainHeight(vector3d(pos_.x-delta, pos_.y, pos_.z))-radius-height);
+ v[2] = fabs(planet->GetTerrainHeight(vector3d(pos_.x, pos_.y, pos_.z+delta))-radius-height);
+ v[3] = fabs(planet->GetTerrainHeight(vector3d(pos_.x, pos_.y, pos_.z-delta))-radius-height);
+ v[4] = fabs(planet->GetTerrainHeight(vector3d(pos_.x, pos_.y+delta, pos_.z))-radius-height);
+ v[5] = fabs(planet->GetTerrainHeight(vector3d(pos_.x, pos_.y-delta, pos_.z))-radius-height);
+
+ // break if variation for all points is within limits
+ double variationMax = 0.0;
+ for (int i = 0; i < 6; i++) {
+ variationWithinLimits = variationWithinLimits && (v[i] < maxHeightVariation);
+ variationMax = (v[i] > variationMax)? v[i]:variationMax;
+ }
+
+ // check if underwater
+ const bool starportUnderwater = (height <= 0.0);
+
+ //printf("%s: try no: %i, Match found: %i, best variation in previous results %f, variationMax this try: %f, maxHeightVariation: %f, Starport is underwater: %i\n",
+ // sbody->name.c_str(), tries, (variationWithinLimits && !starportUnderwater), bestVariation, variationMax, maxHeightVariation, starportUnderwater);
+
+ if (tries == 0) {
+ isInitiallyUnderwater = starportUnderwater;
+ initialVariationTooHigh = !variationWithinLimits;
+ }
+
+ if (!starportUnderwater && variationMax < bestVariation) {
+ bestVariation = variationMax;
+ posNotUnderwaterWithLeastVariation = pos_;
+ rotNotUnderwaterWithLeastVariation = rot_;
+ }
+
+ if (variationWithinLimits && !starportUnderwater) break;
+
+ // try new random position
+ const double r2 = r.Double(); // function parameter evaluation order is implementation-dependent
+ const double r1 = r.Double(); // can't put two rands in the same expression
+ rot_ = matrix4x4d::RotateZMatrix(2*M_PI*r1)
+ * matrix4x4d::RotateYMatrix(2*M_PI*r2);
+ pos_ = rot_ * vector3d(0,1,0);
+ }
+
+ if (isInitiallyUnderwater || (isRelocatableIfBuried && initialVariationTooHigh)) {
+ pos = posNotUnderwaterWithLeastVariation;
+ rot = rotNotUnderwaterWithLeastVariation;
+ }
+
+ if (sbody->isCustomBody) {
+ SystemPath &p = sbody->path;
+ if (initialVariationTooHigh) {
+ if (isRelocatableIfBuried) {
+ printf("Warning: Lua custom Systems definition: Surface starport has been automatically relocated. This is in order to place it on flatter ground to reduce the chance of landing pads being buried. This is not an error as such and you may attempt to move the starport to another location by changing latitude and longitude fields.\n Surface starport name: %s, Body name: %s, In sector: x = %i, y = %i, z = %i.\n",
+ sbody->name.c_str(), sbody->parent->name.c_str(), p.sectorX, p.sectorY, p.sectorZ);
+ } else {
+ printf("Warning: Lua custom Systems definition: Surface starport may have landing pads buried. The surface starport has not been automatically relocated as the planet appears smooth enough to manually relocate easily. This is not an error as such and you may attempt to move the starport to another location by changing latitude and longitude fields.\n Surface starport name: %s, Body name: %s, In sector: x = %i, y = %i, z = %i.\n",
+ sbody->name.c_str(), sbody->parent->name.c_str(), p.sectorX, p.sectorY, p.sectorZ);
+ }
+ }
+ if (isInitiallyUnderwater) {
+ fprintf(stderr, "Error: Lua custom Systems definition: Surface starport is underwater (height not greater than 0.0) and has been automatically relocated. Please move the starport to another location by changing latitude and longitude fields.\n Surface starport name: %s, Body name: %s, In sector: x = %i, y = %i, z = %i.\n",
+ sbody->name.c_str(), sbody->parent->name.c_str(), p.sectorX, p.sectorY, p.sectorZ);
+ }
+ }
+}
+
static Frame *MakeFrameFor(SystemBody *sbody, Body *b, Frame *f)
{
Frame *orbFrame, *rotFrame;
@@ -377,7 +492,7 @@ static Frame *MakeFrameFor(SystemBody *sbody, Body *b, Frame *f)
vector3d angVel = vector3d(0.0, 2.0*M_PI/sbody->GetRotationPeriod(), 0.0);
rotFrame->SetAngVelocity(angVel);
- if (sbody->rotationalPhaseAtStart != fixed(0))
+ if (sbody->rotationalPhaseAtStart != fixed(0))
rotMatrix = rotMatrix * matrix4x4d::RotateYMatrix(sbody->rotationalPhaseAtStart.ToDouble());
rotFrame->SetRotationOnly(rotMatrix);
@@ -418,31 +533,11 @@ static Frame *MakeFrameFor(SystemBody *sbody, Body *b, Frame *f)
Frame *frame = *f->m_children.begin();
b->SetFrame(frame);
assert(frame->m_astroBody->IsType(Object::PLANET));
- Planet *planet = static_cast<Planet*>(frame->m_astroBody);
-
- /* position on planet surface */
- double height;
- int tries;
matrix4x4d rot;
vector3d pos;
- // first try suggested position
- rot = sbody->orbit.rotMatrix;
- pos = rot * vector3d(0,1,0);
- if (planet->GetTerrainHeight(pos) - planet->GetSystemBody()->GetRadius() <= 0.0) {
- MTRand r(sbody->seed);
- // position is under water. try some random ones
- for (tries=0; tries<100; tries++) {
- // used for orientation on planet surface
- double r2 = r.Double(); // function parameter evaluation order is implementation-dependent
- double r1 = r.Double(); // can't put two rands in the same expression
- rot = matrix4x4d::RotateZMatrix(2*M_PI*r1)
- * matrix4x4d::RotateYMatrix(2*M_PI*r2);
- pos = rot * vector3d(0,1,0);
- height = planet->GetTerrainHeight(pos) - planet->GetSystemBody()->GetRadius();
- // don't want to be under water
- if (height > 0.0) break;
- }
- }
+ Planet *planet = static_cast<Planet*>(frame->m_astroBody);
+ RelocateStarportIfUnderwaterOrBuried(sbody, frame, planet, pos, rot);
+ sbody->orbit.rotMatrix = rot;
b->SetPosition(pos * planet->GetTerrainHeight(pos));
b->SetRotMatrix(rot);
return frame;
View
205 src/WorldView.cpp
@@ -60,7 +60,6 @@ void WorldView::InitObject()
m_showTargetActionsTimeout = 0;
m_showLowThrustPowerTimeout = 0;
m_showCameraNameTimeout = 0;
- m_numLights = 1;
m_labelsOn = true;
SetTransparency(true);
@@ -399,6 +398,9 @@ void WorldView::OnClickHyperspace()
void WorldView::Draw3D()
{
+ assert(Pi::game);
+ assert(Pi::player);
+ assert(!Pi::player->IsDead());
m_activeCamera->Draw(m_renderer);
}
@@ -436,85 +438,83 @@ void WorldView::RefreshHyperspaceButton() {
void WorldView::RefreshButtonStateAndVisibility()
{
+ assert(Pi::game);
+ assert(Pi::player);
+ assert(!Pi::player->IsDead());
+
Pi::cpan->ClearOverlay();
- if (!Pi::player || Pi::player->IsDead() || !Pi::game) {
- HideAll();
- return;
+ if (Pi::player->GetFlightState() != Ship::HYPERSPACE) {
+ Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_TOP_LEFT, Lang::SHIP_VELOCITY_BY_REFERENCE_OBJECT);
+ Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_TOP_RIGHT, Lang::DISTANCE_FROM_SHIP_TO_NAV_TARGET);
+ Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_BOTTOM_LEFT, Lang::EXTERNAL_ATMOSPHERIC_PRESSURE);
+ Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_BOTTOM_RIGHT, Lang::SHIP_ALTITUDE_ABOVE_TERRAIN);
}
- else {
- if (Pi::player->GetFlightState() != Ship::HYPERSPACE) {
- Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_TOP_LEFT, Lang::SHIP_VELOCITY_BY_REFERENCE_OBJECT);
- Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_TOP_RIGHT, Lang::DISTANCE_FROM_SHIP_TO_NAV_TARGET);
- Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_BOTTOM_LEFT, Lang::EXTERNAL_ATMOSPHERIC_PRESSURE);
- Pi::cpan->SetOverlayToolTip(ShipCpanel::OVERLAY_BOTTOM_RIGHT, Lang::SHIP_ALTITUDE_ABOVE_TERRAIN);
- }
-
- m_wheelsButton->SetActiveState(int(Pi::player->GetWheelState()));
-
- RefreshHyperspaceButton();
-
- switch(Pi::player->GetFlightState()) {
- case Ship::LANDED:
- m_flightStatus->SetText(Lang::LANDED);
- m_launchButton->Show();
- m_flightControlButton->Hide();
- break;
-
- case Ship::DOCKING:
- m_flightStatus->SetText(Lang::DOCKING);
- m_launchButton->Hide();
- m_flightControlButton->Hide();
- break;
-
- case Ship::DOCKED:
- m_flightStatus->SetText(Lang::DOCKED);
- m_launchButton->Show();
- m_flightControlButton->Hide();
- break;
- case Ship::HYPERSPACE:
- m_flightStatus->SetText(Lang::HYPERSPACE);
- m_launchButton->Hide();
- m_flightControlButton->Hide();
- break;
-
- case Ship::FLYING:
- default:
- const FlightControlState fstate = Pi::player->GetPlayerController()->GetFlightControlState();
- switch (fstate) {
- case CONTROL_MANUAL:
- m_flightStatus->SetText(Lang::MANUAL_CONTROL); break;
-
- case CONTROL_FIXSPEED: {
- std::string msg;
- const double setspeed = Pi::player->GetPlayerController()->GetSetSpeed();
- if (setspeed > 1000) {
- msg = stringf(Lang::SET_SPEED_KM_S, formatarg("speed", setspeed*0.001));
- } else {
- msg = stringf(Lang::SET_SPEED_M_S, formatarg("speed", setspeed));
- }
- m_flightStatus->SetText(msg);
- break;
+ m_wheelsButton->SetActiveState(int(Pi::player->GetWheelState()));
+
+ RefreshHyperspaceButton();
+
+ switch(Pi::player->GetFlightState()) {
+ case Ship::LANDED:
+ m_flightStatus->SetText(Lang::LANDED);
+ m_launchButton->Show();
+ m_flightControlButton->Hide();
+ break;
+
+ case Ship::DOCKING:
+ m_flightStatus->SetText(Lang::DOCKING);
+ m_launchButton->Hide();
+ m_flightControlButton->Hide();
+ break;
+
+ case Ship::DOCKED:
+ m_flightStatus->SetText(Lang::DOCKED);
+ m_launchButton->Show();
+ m_flightControlButton->Hide();
+ break;
+
+ case Ship::HYPERSPACE:
+ m_flightStatus->SetText(Lang::HYPERSPACE);
+ m_launchButton->Hide();
+ m_flightControlButton->Hide();
+ break;
+
+ case Ship::FLYING:
+ default:
+ const FlightControlState fstate = Pi::player->GetPlayerController()->GetFlightControlState();
+ switch (fstate) {
+ case CONTROL_MANUAL:
+ m_flightStatus->SetText(Lang::MANUAL_CONTROL); break;
+
+ case CONTROL_FIXSPEED: {
+ std::string msg;
+ const double setspeed = Pi::player->GetPlayerController()->GetSetSpeed();
+ if (setspeed > 1000) {
+ msg = stringf(Lang::SET_SPEED_KM_S, formatarg("speed", setspeed*0.001));
+ } else {
+ msg = stringf(Lang::SET_SPEED_M_S, formatarg("speed", setspeed));
}
+ m_flightStatus->SetText(msg);
+ break;
+ }
- case CONTROL_FIXHEADING_FORWARD:
- m_flightStatus->SetText(Lang::HEADING_LOCK_FORWARD);
- break;
- case CONTROL_FIXHEADING_BACKWARD:
- m_flightStatus->SetText(Lang::HEADING_LOCK_BACKWARD);
- break;
+ case CONTROL_FIXHEADING_FORWARD:
+ m_flightStatus->SetText(Lang::HEADING_LOCK_FORWARD);
+ break;
+ case CONTROL_FIXHEADING_BACKWARD:
+ m_flightStatus->SetText(Lang::HEADING_LOCK_BACKWARD);
+ break;
- case CONTROL_AUTOPILOT:
- m_flightStatus->SetText(Lang::AUTOPILOT);
- break;
+ case CONTROL_AUTOPILOT:
+ m_flightStatus->SetText(Lang::AUTOPILOT);
+ break;
- default: assert(0); break;
- }
+ default: assert(0); break;
+ }
- m_launchButton->Hide();
- m_flightControlButton->Show();
- }
+ m_launchButton->Hide();
+ m_flightControlButton->Show();
}
// Direction indicator
@@ -778,6 +778,10 @@ void WorldView::RefreshButtonStateAndVisibility()
void WorldView::Update()
{
+ assert(Pi::game);
+ assert(Pi::player);
+ assert(!Pi::player->IsDead());
+
const double frameTime = Pi::GetFrameTime();
// show state-appropriate buttons
RefreshButtonStateAndVisibility();
@@ -793,39 +797,31 @@ void WorldView::Update()
bool targetObject = false;
- //death animation: slowly pan out
- if (Pi::player->IsDead()) {
- SetCamType(CAM_EXTERNAL);
- static_cast<ExternalCamera*>(m_externalCamera)->SetRotationAngles(0.0, 0.0);
- m_externalCamera->ZoomOut(frameTime * 0.4);
- m_labelsOn = false;
- } else {
- // XXX ugly hack checking for console here
- if (!Pi::IsConsoleActive()) {
- if (m_activeCamera->IsExternal() == false) {
- if (KeyBindings::frontCockpit.IsActive() && GetCamType() != COCKPIT_FRONT) SetCamType(COCKPIT_FRONT);
- if (KeyBindings::rearCockpit.IsActive() && GetCamType() != COCKPIT_REAR) SetCamType(COCKPIT_REAR);
- if (KeyBindings::frontCamera.IsActive() && GetCamType() != CAM_FRONT) SetCamType(CAM_FRONT);
- if (KeyBindings::rearCamera.IsActive() && GetCamType() != CAM_REAR) SetCamType(CAM_REAR);
- if (KeyBindings::leftCamera.IsActive() && GetCamType() != CAM_LEFT) SetCamType(CAM_LEFT);
- if (KeyBindings::rightCamera.IsActive() && GetCamType() != CAM_RIGHT) SetCamType(CAM_RIGHT);
- if (KeyBindings::topCamera.IsActive() && GetCamType() != CAM_TOP) SetCamType(CAM_TOP);
- if (KeyBindings::bottomCamera.IsActive() && GetCamType() != CAM_BOTTOM) SetCamType(CAM_BOTTOM);
- } else {
- if (KeyBindings::cameraRotateUp.IsActive()) m_activeCamera->RotateUp(frameTime);
- if (KeyBindings::cameraRotateDown.IsActive()) m_activeCamera->RotateDown(frameTime);
- if (KeyBindings::cameraRotateLeft.IsActive()) m_activeCamera->RotateLeft(frameTime);
- if (KeyBindings::cameraRotateRight.IsActive()) m_activeCamera->RotateRight(frameTime);
- if (KeyBindings::cameraZoomOut.IsActive()) m_activeCamera->ZoomEvent(ZOOM_SPEED*frameTime); // Zoom out
- if (KeyBindings::cameraZoomIn.IsActive()) m_activeCamera->ZoomEvent(-ZOOM_SPEED*frameTime);
- if (KeyBindings::cameraRollLeft.IsActive()) m_activeCamera->RollLeft(frameTime);
- if (KeyBindings::cameraRollRight.IsActive()) m_activeCamera->RollRight(frameTime);
- if (KeyBindings::resetCamera.IsActive()) m_activeCamera->Reset();
- m_activeCamera->ZoomEventUpdate(frameTime);
- }
- // note if we have to target the object in the crosshairs
- targetObject = KeyBindings::targetObject.IsActive();
+ // XXX ugly hack checking for console here
+ if (!Pi::IsConsoleActive()) {
+ if (m_activeCamera->IsExternal() == false) {
+ if (KeyBindings::frontCockpit.IsActive() && GetCamType() != COCKPIT_FRONT) SetCamType(COCKPIT_FRONT);
+ if (KeyBindings::rearCockpit.IsActive() && GetCamType() != COCKPIT_REAR) SetCamType(COCKPIT_REAR);
+ if (KeyBindings::frontCamera.IsActive() && GetCamType() != CAM_FRONT) SetCamType(CAM_FRONT);
+ if (KeyBindings::rearCamera.IsActive() && GetCamType() != CAM_REAR) SetCamType(CAM_REAR);
+ if (KeyBindings::leftCamera.IsActive() && GetCamType() != CAM_LEFT) SetCamType(CAM_LEFT);
+ if (KeyBindings::rightCamera.IsActive() && GetCamType() != CAM_RIGHT) SetCamType(CAM_RIGHT);
+ if (KeyBindings::topCamera.IsActive() && GetCamType() != CAM_TOP) SetCamType(CAM_TOP);
+ if (KeyBindings::bottomCamera.IsActive() && GetCamType() != CAM_BOTTOM) SetCamType(CAM_BOTTOM);
+ } else {
+ if (KeyBindings::cameraRotateUp.IsActive()) m_activeCamera->RotateUp(frameTime);
+ if (KeyBindings::cameraRotateDown.IsActive()) m_activeCamera->RotateDown(frameTime);
+ if (KeyBindings::cameraRotateLeft.IsActive()) m_activeCamera->RotateLeft(frameTime);
+ if (KeyBindings::cameraRotateRight.IsActive()) m_activeCamera->RotateRight(frameTime);
+ if (KeyBindings::cameraZoomOut.IsActive()) m_activeCamera->ZoomEvent(ZOOM_SPEED*frameTime); // Zoom out
+ if (KeyBindings::cameraZoomIn.IsActive()) m_activeCamera->ZoomEvent(-ZOOM_SPEED*frameTime);
+ if (KeyBindings::cameraRollLeft.IsActive()) m_activeCamera->RollLeft(frameTime);
+ if (KeyBindings::cameraRollRight.IsActive()) m_activeCamera->RollRight(frameTime);
+ if (KeyBindings::resetCamera.IsActive()) m_activeCamera->Reset();
+ m_activeCamera->ZoomEventUpdate(frameTime);
}
+ // note if we have to target the object in the crosshairs
+ targetObject = KeyBindings::targetObject.IsActive();
}
if (m_showCameraNameTimeout) {
@@ -1520,6 +1516,9 @@ double getSquareHeight(double distance, double angle) {
void WorldView::Draw()
{
+ assert(Pi::game);
+ assert(Pi::player);
+ assert(!Pi::player->IsDead());
View::Draw();
// don't draw crosshairs etc in hyperspace
View
3  src/WorldView.h
@@ -31,7 +31,6 @@ class WorldView: public View {
virtual void Draw3D();
virtual void Draw();
static const double PICK_OBJECT_RECT_SIZE;
- void DrawBgStars();
virtual void Save(Serializer::Writer &wr);
enum CamType {
COCKPIT_FRONT,
@@ -48,7 +47,6 @@ class WorldView: public View {
void SetCamType(enum CamType);
enum CamType GetCamType() const { return m_camType; }
WorldViewCamera *GetActiveCamera() const { return m_activeCamera; }
- int GetNumLights() const { return m_numLights; }
void ToggleTargetActions();
void ShowTargetActions();
void HideTargetActions();
@@ -133,7 +131,6 @@ class WorldView: public View {
Gui::MultiStateImageButton *m_flightControlButton;
bool m_labelsOn;
enum CamType m_camType;
- int m_numLights;
Uint32 m_showTargetActionsTimeout;
Uint32 m_showLowThrustPowerTimeout;
Uint32 m_showCameraNameTimeout;
View
3  src/galaxy/StarSystem.cpp
@@ -928,6 +928,7 @@ void StarSystem::CustomGetKidsOf(SystemBody *parent, const std::vector<CustomSys
kid->radius = csbody->radius;
kid->averageTemp = csbody->averageTemp;
kid->name = csbody->name;
+ kid->isCustomBody = true;
kid->mass = csbody->mass;
if (kid->type == SystemBody::TYPE_PLANET_ASTEROID) kid->mass /= 100000;
@@ -1015,6 +1016,7 @@ void StarSystem::GenerateFromCustom(const CustomSystem *customSys, MTRand &rand)
rootBody->mass = csbody->mass;
rootBody->averageTemp = csbody->averageTemp;
rootBody->name = csbody->name;
+ rootBody->isCustomBody = true;
rootBody->rotationalPhaseAtStart = csbody->rotationalPhaseAtStart;
rootBody->orbitalPhaseAtStart = csbody->orbitalPhaseAtStart;
@@ -1097,6 +1099,7 @@ SystemBody::SystemBody()
heightMapFractal = 0;
rotationalPhaseAtStart = fixed(0);
orbitalPhaseAtStart = fixed(0);
+ isCustomBody = false;
}
bool SystemBody::HasAtmosphere() const
View
1  src/galaxy/StarSystem.h
@@ -197,6 +197,7 @@ class SystemBody {
fixed axialTilt; // in radians
int averageTemp;
BodyType type;
+ bool isCustomBody;
/* composition */
fixed m_metallicity; // (crust) 0.0 = light (Al, SiO2, etc), 1.0 = heavy (Fe, heavy metals)
View
9 src/gui/GuiToolTip.cpp
@@ -8,15 +8,17 @@ namespace Gui {
#define TOOLTIP_PADDING 5
#define FADE_TIME_MS 500
-ToolTip::ToolTip(const char *text)
+ToolTip::ToolTip(Widget *owner, const char *text)
{
+ m_owner = owner;
m_layout = 0;
SetText(text);
m_createdTime = SDL_GetTicks();
}
-ToolTip::ToolTip(std::string &text)
+ToolTip::ToolTip(Widget *owner, std::string &text)
{
+ m_owner = owner;
m_layout = 0;
SetText(text.c_str());
m_createdTime = SDL_GetTicks();
@@ -50,6 +52,9 @@ void ToolTip::SetText(std::string &text)
void ToolTip::Draw()
{
+ if (m_owner && !m_owner->IsVisible())
+ return;
+
float size[2];
int age = SDL_GetTicks() - m_createdTime;
float alpha = age/float(FADE_TIME_MS); alpha = std::min(alpha, 0.75f);
View
5 src/gui/GuiToolTip.h
@@ -10,8 +10,8 @@
namespace Gui {
class ToolTip: public Widget {
public:
- ToolTip(const char *text);
- ToolTip(std::string &text);
+ ToolTip(Widget *owner, const char *text);
+ ToolTip(Widget *owner, std::string &text);
virtual void Draw();
virtual ~ToolTip();
virtual void GetSizeRequested(float size[2]);
@@ -19,6 +19,7 @@ namespace Gui {
void SetText(std::string &text);
private:
void CalcSize();
+ Widget *m_owner;
std::string m_text;
TextLayout *m_layout;
Uint32 m_createdTime;
View
22 src/gui/GuiWidget.cpp
@@ -104,11 +104,8 @@ void Widget::OnMouseEnter()
void Widget::OnMouseLeave()
{
m_mouseOver = false;
- if (m_tooltipWidget) {
- Screen::RemoveBaseWidget(m_tooltipWidget);
- delete m_tooltipWidget;
- m_tooltipWidget = 0;
- }
+ HideTooltip();
+ assert(!m_tooltipWidget);
m_tooltipTimerConnection.disconnect();
onMouseLeave.emit();
}
@@ -132,7 +129,7 @@ void Widget::OnToolTip()
float pos[2];
GetAbsolutePosition(pos);
- m_tooltipWidget = new ToolTip(text);
+ m_tooltipWidget = new ToolTip(this, text);
if (m_tooltipWidget->m_size.w + pos[0] > Screen::GetWidth())
pos[0] = Screen::GetWidth() - m_tooltipWidget->m_size.w;
if (m_tooltipWidget->m_size.h + pos[1] > Screen::GetHeight())
@@ -146,12 +143,18 @@ void Widget::OnToolTip()
void Widget::Hide()
{
m_visible = false;
+ HideTooltip();
+ assert(!m_tooltipWidget);
+ m_tooltipTimerConnection.disconnect();
+}
+
+void Widget::HideTooltip()
+{
if (m_tooltipWidget) {
Screen::RemoveBaseWidget(m_tooltipWidget);
delete m_tooltipWidget;
m_tooltipWidget = 0;
}
- m_tooltipTimerConnection.disconnect();
}
void Widget::ResizeRequest()
@@ -168,10 +171,7 @@ void Widget::ResizeRequest()
Widget::~Widget()
{
onDelete.emit();
- if (m_tooltipWidget) {
- Screen::RemoveBaseWidget(m_tooltipWidget);
- delete m_tooltipWidget;
- }
+ HideTooltip();
Screen::RemoveShortcutWidget(this);
m_tooltipTimerConnection.disconnect();
}
View
1  src/gui/GuiWidget.h
@@ -33,6 +33,7 @@ namespace Gui {
virtual void ShowAll() { m_visible = true; }
virtual void Show() { m_visible = true; }
virtual void Hide();
+ void HideTooltip();
bool IsVisible() const;
Container *GetParent() const { return m_parent; }
void SetParent(Container *p) { m_parent = p; }
View
4 src/win32/pioneer.rc
@@ -0,0 +1,4 @@
+// Copyright © 2008-2012 Pioneer Developers. See AUTHORS.txt for details
+// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
+id ICON "../../application-icon/pioneer.ico"
View
BIN  win32/lib/libogg_static_vc2012_debug.lib
Binary file not shown
View
BIN  win32/lib/libogg_static_vc2012_debug.pdb
Binary file not shown
View
BIN  win32/lib/libogg_static_vc2012_release.lib
Binary file not shown
View
BIN  win32/lib/libvorbis_static_vc2012_debug.lib
Binary file not shown
View
BIN  win32/lib/libvorbis_static_vc2012_release.lib
Binary file not shown
View
BIN  win32/lib/libvorbisfile_static_vc2012_debug.lib
Binary file not shown
View
BIN  win32/lib/libvorbisfile_static_vc2012_release.lib
Binary file not shown
View
20 win32/vc2008/pioneer-msvc-9.0.vcproj
@@ -342,6 +342,10 @@
>
</File>
<File
+ RelativePath="..\..\src\DeathView.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\src\DynamicBody.cpp"
>
</File>
@@ -590,6 +594,10 @@
>
</File>
<File
+ RelativePath="..\..\src\LuaDev.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\src\LuaEngine.cpp"
>
</File>
@@ -1280,6 +1288,10 @@
>
</File>
<File
+ RelativePath="..\..\src\DeathView.h"
+ >
+ </File>
+ <File
RelativePath="..\..\src\DeleteEmitter.h"
>
</File>
@@ -1536,6 +1548,10 @@
>
</File>
<File
+ RelativePath="..\..\src\KeyBindings.inc.h"
+ >
+ </File>
+ <File
RelativePath="..\..\src\Lang.h"
>
</File>
@@ -1580,6 +1596,10 @@
>
</File>
<File
+ RelativePath="..\..\src\LuaDev.h"
+ >
+ </File>
+ <File
RelativePath="..\..\src\LuaEngine.h"
>
</File>
View
7 win32/vc2010/pioneer.vcxproj
@@ -111,6 +111,7 @@
<ClCompile Include="..\..\src\CommodityTradeWidget.cpp" />
<ClCompile Include="..\..\src\CRC32.cpp" />
<ClCompile Include="..\..\src\DeadVideoLink.cpp" />
+ <ClCompile Include="..\..\src\DeathView.cpp" />
<ClCompile Include="..\..\src\DynamicBody.cpp" />
<ClCompile Include="..\..\src\enum_table.cpp" />
<ClCompile Include="..\..\src\EquipType.cpp" />
@@ -141,6 +142,7 @@
<ClCompile Include="..\..\src\LuaComms.cpp" />
<ClCompile Include="..\..\src\LuaConsole.cpp" />
<ClCompile Include="..\..\src\LuaConstants.cpp" />
+ <ClCompile Include="..\..\src\LuaDev.cpp" />
<ClCompile Include="..\..\src\LuaEngine.cpp" />
<ClCompile Include="..\..\src\LuaEquipType.cpp" />
<ClCompile Include="..\..\src\LuaEvent.cpp" />
@@ -258,6 +260,7 @@
<ClInclude Include="..\..\src\CommodityTradeWidget.h" />
<ClInclude Include="..\..\src\CRC32.h" />
<ClInclude Include="..\..\src\DeadVideoLink.h" />
+ <ClInclude Include="..\..\src\DeathView.h" />
<ClInclude Include="..\..\src\DeleteEmitter.h" />
<ClInclude Include="..\..\src\DynamicBody.h" />
<ClInclude Include="..\..\src\enum_table.h" />
@@ -291,6 +294,7 @@
<ClInclude Include="..\..\src\LuaComms.h" />
<ClInclude Include="..\..\src\LuaConsole.h" />
<ClInclude Include="..\..\src\LuaConstants.h" />
+ <ClInclude Include="..\..\src\LuaDev.h" />
<ClInclude Include="..\..\src\LuaEngine.h" />
<ClInclude Include="..\..\src\LuaEquipType.h" />
<ClInclude Include="..\..\src\LuaEvent.h" />
@@ -391,6 +395,9 @@
<ItemGroup>
<None Include="..\..\src\Makefile.am" />
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\src\win32\pioneer.rc" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
View
17 win32/vc2010/pioneer.vcxproj.filters
@@ -393,6 +393,12 @@
<ClCompile Include="..\..\src\LuaRef.cpp">
<Filter>src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\DeathView.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\LuaDev.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Aabb.h">
@@ -833,10 +839,21 @@
<ClInclude Include="..\..\contrib\vcacheopt\vcacheopt.h">
<Filter>src</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\DeathView.h">
+ <Filter>src</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\LuaDev.h">
+ <Filter>src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Makefile.am">
<Filter>src</Filter>
</None>
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\src\win32\pioneer.rc">
+ <Filter>src\win32</Filter>
+ </ResourceCompile>
+ </ItemGroup>
</Project>
View
800 win32/vc2012/pioneer.vcxproj
@@ -1,399 +1,403 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="PreRelease|Win32">
- <Configuration>PreRelease</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{65A1BBFB-7A42-497C-BF65-A0A06664A204}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>pioneer</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="common.props" />
- <Import Project="Debug.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="common.props" />
- <Import Project="PreRelease.props" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="common.props" />
- <Import Project="Release.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>$(SolutionDir)..\..\</OutDir>
- <TargetName>$(ProjectName)-debug</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
- <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>$(SolutionDir)..\..\</OutDir>
- <TargetName>$(ProjectName)-prerelease</TargetName>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IntDir>$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir>$(SolutionDir)..\..\</OutDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>../../src;../../win32/src;../../win32/include;../../contrib</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <AdditionalDependencies>shlwapi.lib;libogg_static_vc2012_debug.lib;libvorbis_static_vc2012_debug.lib;libvorbisfile_static_vc2012_debug.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-d-2_2_8.lib;libpng15_staticd.lib;zlibd.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;jenkins.lib;lua.lib;miniz.lib;terrain.lib;text.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>../../win32/lib;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
- <ClCompile />
- <Link>
- <SubSystem>Windows</SubSystem>
- <AdditionalDependencies>shlwapi.lib;libogg_static_vc2012_release.lib;libvorbis_static_vc2012_release.lib;libvorbisfile_static_vc2012_release.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-d-2_2_8.lib;libpng15_staticd.lib;zlibd.lib;collider.lib;galaxy.lib;graphics.lib;gui.lib;jenkins.lib;lua.lib;miniz.lib;terrain.lib;text.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>../../win32/lib;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile />
- <Link>
- <SubSystem>Windows</SubSystem>
- <AdditionalDependencies>lua.lib;jenkins.lib;miniz.lib;shlwapi.lib;libogg_static_vc2012_release.lib;libvorbis_static_vc2012_release.lib;libvorbisfile_static_vc2012_release.lib;sdl.lib;sdlmain.lib;opengl32.lib;glu32.lib;SDL_image.lib;freetype2312MT.lib;glew32.lib;sigc-vc2012-2_2_8.lib;libpng15_static.lib;zlib.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;gui.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>../../win32/lib;$(SolutionDir)$(Configuration)</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\AmbientSounds.cpp" />
- <ClCompile Include="..\..\src\Background.cpp" />
- <ClCompile Include="..\..\src\Body.cpp" />
- <ClCompile Include="..\..\src\Camera.cpp" />
- <ClCompile Include="..\..\src\CargoBody.cpp" />
- <ClCompile Include="..\..\src\ChatForm.cpp" />
- <ClCompile Include="..\..\src\CityOnPlanet.cpp" />
- <ClCompile Include="..\..\src\Color.cpp" />
- <ClCompile Include="..\..\src\CommodityTradeWidget.cpp" />
- <ClCompile Include="..\..\src\CRC32.cpp" />
- <ClCompile Include="..\..\src\DeadVideoLink.cpp" />
- <ClCompile Include="..\..\src\DynamicBody.cpp" />
- <ClCompile Include="..\..\src\enum_table.cpp" />
- <ClCompile Include="..\..\src\EquipType.cpp" />
- <ClCompile Include="..\..\src\FaceVideoLink.cpp" />
- <ClCompile Include="..\..\src\FileSelectorWidget.cpp" />
- <ClCompile Include="..\..\src\FileSourceZip.cpp" />
- <ClCompile Include="..\..\src\FileSystem.cpp" />
- <ClCompile Include="..\..\src\FontCache.cpp" />
- <ClCompile Include="..\..\src\FontConfig.cpp" />
- <ClCompile Include="..\..\src\FormController.cpp" />
- <ClCompile Include="..\..\src\Frame.cpp" />
- <ClCompile Include="..\..\src\GalacticView.cpp" />
- <ClCompile Include="..\..\src\Game.cpp" />
- <ClCompile Include="..\..\src\GameConfig.cpp" />
- <ClCompile Include="..\..\src\GameLoaderSaver.cpp" />
- <ClCompile Include="..\..\src\GameMenuView.cpp" />
- <ClCompile Include="..\..\src\GeoSphere.cpp" />
- <ClCompile Include="..\..\src\HyperspaceCloud.cpp" />
- <ClCompile Include="..\..\src\InfoView.cpp" />
- <ClCompile Include="..\..\src\IniConfig.cpp" />
- <ClCompile Include="..\..\src\KeyBindings.cpp" />
- <ClCompile Include="..\..\src\Lang.cpp" />
- <ClCompile Include="..\..\src\LmrModel.cpp" />
- <ClCompile Include="..\..\src\Lua.cpp" />
- <ClCompile Include="..\..\src\LuaBody.cpp" />
- <ClCompile Include="..\..\src\LuaCargoBody.cpp" />
- <ClCompile Include="..\..\src\LuaChatForm.cpp" />
- <ClCompile Include="..\..\src\LuaComms.cpp" />
- <ClCompile Include="..\..\src\LuaConsole.cpp" />
- <ClCompile Include="..\..\src\LuaConstants.cpp" />
- <ClCompile Include="..\..\src\LuaEngine.cpp" />
- <ClCompile Include="..\..\src\LuaEquipType.cpp" />
- <ClCompile Include="..\..\src\LuaEvent.cpp" />
- <ClCompile Include="..\..\src\LuaFileSystem.cpp" />
- <ClCompile Include="..\..\src\LuaFixed.cpp" />
- <ClCompile Include="..\..\src\LuaFormat.cpp" />
- <ClCompile Include="..\..\src\LuaGame.cpp" />
- <ClCompile Include="..\..\src\LuaLang.cpp" />
- <ClCompile Include="..\..\src\LuaManager.cpp" />
- <ClCompile Include="..\..\src\LuaMatrix.cpp" />
- <ClCompile Include="..\..\src\LuaMusic.cpp" />
- <ClCompile Include="..\..\src\LuaNameGen.cpp" />
- <ClCompile Include="..\..\src\LuaObject.cpp" />
- <ClCompile Include="..\..\src\LuaPlanet.cpp" />
- <ClCompile Include="..\..\src\LuaPlayer.cpp" />
- <ClCompile Include="..\..\src\LuaRand.cpp" />
- <ClCompile Include="..\..\src\LuaRef.cpp" />
- <ClCompile Include="..\..\src\LuaSerializer.cpp" />
- <ClCompile Include="..\..\src\LuaShip.cpp" />
- <ClCompile Include="..\..\src\LuaShipType.cpp" />
- <ClCompile Include="..\..\src\LuaSpace.cpp" />
- <ClCompile Include="..\..\src\LuaSpaceStation.cpp" />
- <ClCompile Include="..\..\src\LuaStar.cpp" />
- <ClCompile Include="..\..\src\LuaStarSystem.cpp" />
- <ClCompile Include="..\..\src\LuaSystemBody.cpp" />
- <ClCompile Include="..\..\src\LuaSystemPath.cpp" />
- <ClCompile Include="..\..\src\LuaTimer.cpp" />
- <ClCompile Include="..\..\src\LuaUtils.cpp" />
- <ClCompile Include="..\..\src\LuaVector.cpp" />
- <ClCompile Include="..\..\src\main.cpp" />
- <ClCompile Include="..\..\src\MarketAgent.cpp" />
- <ClCompile Include="..\..\src\MathUtil.cpp" />
- <ClCompile Include="..\..\src\Missile.cpp" />
- <ClCompile Include="..\..\src\ModelBody.cpp" />
- <ClCompile Include="..\..\src\ModManager.cpp" />
- <ClCompile Include="..\..\src\mtrand.cpp" />
- <ClCompile Include="..\..\src\ObjectViewerView.cpp" />
- <ClCompile Include="..\..\src\perlin.cpp" />
- <ClCompile Include="..\..\src\Pi.cpp" />
- <ClCompile Include="..\..\src\Planet.cpp" />
- <ClCompile Include="..\..\src\Player.cpp" />
- <ClCompile Include="..\..\src\Polit.cpp" />
- <ClCompile Include="..\..\src\posix\FileSystemPosix.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\src\posix\OSPosix.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\src\Projectile.cpp" />
- <ClCompile Include="..\..\src\SDLWrappers.cpp" />
- <ClCompile Include="..\..\src\SectorView.cpp" />
- <ClCompile Include="..\..\src\Serializer.cpp" />
- <ClCompile Include="..\..\src\Sfx.cpp" />
- <ClCompile Include="..\..\src\Ship-AI.cpp" />
- <ClCompile Include="..\..\src\Ship.cpp" />
- <ClCompile Include="..\..\src\ShipAICmd.cpp" />
- <ClCompile Include="..\..\src\ShipController.cpp" />
- <ClCompile Include="..\..\src\ShipCpanel.cpp" />
- <ClCompile Include="..\..\src\ShipCpanelMultiFuncDisplays.cpp" />
- <ClCompile Include="..\..\src\ShipFlavour.cpp" />
- <ClCompile Include="..\..\src\ShipSpinnerWidget.cpp" />
- <ClCompile Include="..\..\src\ShipType.cpp" />
- <ClCompile Include="..\..\src\Sound.cpp" />
- <ClCompile Include="..\..\src\SoundMusic.cpp" />
- <ClCompile Include="..\..\src\Space.cpp" />
- <ClCompile Include="..\..\src\SpaceStation.cpp" />
- <ClCompile Include="..\..\src\SpaceStationView.cpp" />
- <ClCompile Include="..\..\src\Star.cpp" />
- <ClCompile Include="..\..\src\StationAdvertForm.cpp" />
- <ClCompile Include="..\..\src\StationBulletinBoardForm.cpp" />
- <ClCompile Include="..\..\src\StationCommodityMarketForm.cpp" />
- <ClCompile Include="..\..\src\StationPoliceForm.cpp" />
- <ClCompile Include="..\..\src\StationServicesForm.cpp" />
- <ClCompile Include="..\..\src\StationShipEquipmentForm.cpp" />
- <ClCompile Include="..\..\src\StationShipMarketForm.cpp" />
- <ClCompile Include="..\..\src\StationShipRepairForm.cpp" />
- <ClCompile Include="..\..\src\StationShipViewForm.cpp" />
- <ClCompile Include="..\..\src\StationShipyardForm.cpp" />
- <ClCompile Include="..\..\src\StringF.cpp" />
- <ClCompile Include="..\..\src\SystemInfoView.cpp" />
- <ClCompile Include="..\..\src\SystemView.cpp" />
- <ClCompile Include="..\..\src\TerrainBody.cpp" />
- <ClCompile Include="..\..\src\utils.cpp" />
- <ClCompile Include="..\..\src\View.cpp" />
- <ClCompile Include="..\..\src\win32\FileSystemWin32.cpp" />
- <ClCompile Include="..\..\src\win32\OSWin32.cpp" />
- <ClCompile Include="..\..\src\win32\pch.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\..\src\win32\WinMath.cpp" />
- <ClCompile Include="..\..\src\WorldView.cpp" />
- <ClCompile Include="..\..\src\WorldViewCamera.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\src\Aabb.h" />
- <ClInclude Include="..\..\src\AmbientSounds.h" />
- <ClInclude Include="..\..\src\AnimationCurves.h" />
- <ClInclude Include="..\..\src\Background.h" />
- <ClInclude Include="..\..\src\BezierCurve.h" />
- <ClInclude Include="..\..\src\Body.h" />
- <ClInclude Include="..\..\src\BufferObject.h" />
- <ClInclude Include="..\..\src\buildopts.h" />
- <ClInclude Include="..\..\src\ByteRange.h" />
- <ClInclude Include="..\..\src\Camera.h" />
- <ClInclude Include="..\..\src\CargoBody.h" />
- <ClInclude Include="..\..\src\ChatForm.h" />
- <ClInclude Include="..\..\src\CityOnPlanet.h" />
- <ClInclude Include="..\..\src\Color.h" />
- <ClInclude Include="..\..\src\CommodityTradeWidget.h" />
- <ClInclude Include="..\..\src\CRC32.h" />
- <ClInclude Include="..\..\src\DeadVideoLink.h" />
- <ClInclude Include="..\..\src\DeleteEmitter.h" />
- <ClInclude Include="..\..\src\DynamicBody.h" />
- <ClInclude Include="..\..\src\enum_table.h" />
- <ClInclude Include="..\..\src\EquipType.h" />
- <ClInclude Include="..\..\src\FaceVideoLink.h" />
- <ClInclude Include="..\..\src\FileSelectorWidget.h" />
- <ClInclude Include="..\..\src\FileSourceZip.h" />
- <ClInclude Include="..\..\src\FileSystem.h" />
- <ClInclude Include="..\..\src\fixed.h" />
- <ClInclude Include="..\..\src\FontCache.h" />
- <ClInclude Include="..\..\src\FontConfig.h" />
- <ClInclude Include="..\..\src\FormController.h" />
- <ClInclude Include="..\..\src\Frame.h" />
- <ClInclude Include="..\..\src\GalacticView.h" />
- <ClInclude Include="..\..\src\Game.h" />
- <ClInclude Include="..\..\src\GameConfig.h" />
- <ClInclude Include="..\..\src\gameconsts.h" />
- <ClInclude Include="..\..\src\GameLoaderSaver.h" />
- <ClInclude Include="..\..\src\GameMenuView.h" />
- <ClInclude Include="..\..\src\GeoSphere.h" />
- <ClInclude Include="..\..\src\HyperspaceCloud.h" />
- <ClInclude Include="..\..\src\InfoView.h" />
- <ClInclude Include="..\..\src\IniConfig.h" />
- <ClInclude Include="..\..\src\KeyBindings.h" />
- <ClInclude Include="..\..\src\libs.h" />
- <ClInclude Include="..\..\src\LmrModel.h" />
- <ClInclude Include="..\..\src\Lua.h" />
- <ClInclude Include="..\..\src\LuaBody.h" />
- <ClInclude Include="..\..\src\LuaCargoBody.h" />
- <ClInclude Include="..\..\src\LuaChatForm.h" />
- <ClInclude Include="..\..\src\LuaComms.h" />
- <ClInclude Include="..\..\src\LuaConsole.h" />
- <ClInclude Include="..\..\src\LuaConstants.h" />
- <ClInclude Include="..\..\src\LuaEngine.h" />
- <ClInclude Include="..\..\src\LuaEquipType.h" />
- <ClInclude Include="..\..\src\LuaEvent.h" />
- <ClInclude Include="..\..\src\LuaFileSystem.h" />
- <ClInclude Include="..\..\src\LuaFixed.h" />
- <ClInclude Include="..\..\src\LuaFormat.h" />
- <ClInclude Include="..\..\src\LuaGame.h" />
- <ClInclude Include="..\..\src\LuaLang.h" />
- <ClInclude Include="..\..\src\LuaManager.h" />
- <ClInclude Include="..\..\src\LuaMatrix.h" />
- <ClInclude Include="..\..\src\LuaMusic.h" />
- <ClInclude Include="..\..\src\LuaNameGen.h" />
- <ClInclude Include="..\..\src\LuaObject.h" />
- <ClInclude Include="..\..\src\LuaPlanet.h" />
- <ClInclude Include="..\..\src\LuaPlayer.h" />
- <ClInclude Include="..\..\src\LuaPushPull.h" />
- <ClInclude Include="..\..\src\LuaRand.h" />
- <ClInclude Include="..\..\src\LuaRef.h" />
- <ClInclude Include="..\..\src\LuaSerializer.h" />
- <ClInclude Include="..\..\src\LuaShip.h" />
- <ClInclude Include="..\..\src\LuaShipType.h" />
- <ClInclude Include="..\..\src\LuaSpace.h" />
- <ClInclude Include="..\..\src\LuaSpaceStation.h" />
- <ClInclude Include="..\..\src\LuaStar.h" />
- <ClInclude Include="..\..\src\LuaStarSystem.h" />
- <ClInclude Include="..\..\src\LuaSystemBody.h" />
- <ClInclude Include="..\..\src\LuaSystemPath.h" />
- <ClInclude Include="..\..\src\LuaTable.h" />
- <ClInclude Include="..\..\src\LuaTimer.h" />
- <ClInclude Include="..\..\src\LuaUtils.h" />
- <ClInclude Include="..\..\src\LuaVector.h" />
- <ClInclude Include="..\..\src\MarketAgent.h" />
- <ClInclude Include="..\..\src\MathUtil.h" />
- <ClInclude Include="..\..\src\matrix4x4.h" />
- <ClInclude Include="..\..\src\Missile.h" />
- <ClInclude Include="..\..\src\ModelBody.h" />
- <ClInclude Include="..\..\src\ModManager.h" />
- <ClInclude Include="..\..\src\mtrand.h" />
- <ClInclude Include="..\..\src\Object.h" />
- <ClInclude Include="..\..\src\ObjectViewerView.h" />
- <ClInclude Include="..\..\src\OS.h" />
- <ClInclude Include="..\..\src\perlin.h" />
- <ClInclude Include="..\..\src\PersistSystemData.h" />
- <ClInclude Include="..\..\src\Pi.h" />
- <ClInclude Include="..\..\src\Planet.h" />
- <ClInclude Include="..\..\src\Player.h" />
- <ClInclude Include="..\..\src\Polit.h" />
- <ClInclude Include="..\..\src\Projectile.h" />
- <ClInclude Include="..\..\src\Quaternion.h" />
- <ClInclude Include="..\..\src\RefCounted.h" />
- <ClInclude Include="..\..\src\RefList.h" />
- <ClInclude Include="..\..\src\SDLWrappers.h" />
- <ClInclude Include="..\..\src\SectorView.h" />
- <ClInclude Include="..\..\src\Serializer.h" />
- <ClInclude Include="..\..\src\Sfx.h" />
- <ClInclude Include="..\..\src\Ship.h" />
- <ClInclude Include="..\..\src\ShipAICmd.h" />
- <ClInclude Include="..\..\src\ShipController.h" />
- <ClInclude Include="..\..\src\ShipCpanel.h" />
- <ClInclude Include="..\..\src\ShipCpanelMultiFuncDisplays.h" />
- <ClInclude Include="..\..\src\ShipFlavour.h" />
- <ClInclude Include="..\..\src\ShipSpinnerWidget.h" />
- <ClInclude Include="..\..\src\ShipType.h" />
- <ClInclude Include="..\..\src\SmartPtr.h" />
- <ClInclude Include="..\..\src\Sound.h" />
- <ClInclude Include="..\..\src\SoundMusic.h" />
- <ClInclude Include="..\..\src\Space.h" />
- <ClInclude Include="..\..\src\SpaceStation.h" />
- <ClInclude Include="..\..\src\SpaceStationView.h" />
- <ClInclude Include="..\..\src\Star.h" />
- <ClInclude Include="..\..\src\StationAdvertForm.h" />
- <ClInclude Include="..\..\src\StationBulletinBoardForm.h" />
- <ClInclude Include="..\..\src\StationCommodityMarketForm.h" />
- <ClInclude Include="..\..\src\StationPoliceForm.h" />
- <ClInclude Include="..\..\src\StationServicesForm.h" />
- <ClInclude Include="..\..\src\StationShipEquipmentForm.h" />
- <ClInclude Include="..\..\src\StationShipMarketForm.h" />
- <ClInclude Include="..\..\src\StationShipRepairForm.h" />
- <ClInclude Include="..\..\src\StationShipViewForm.h" />
- <ClInclude Include="..\..\src\StationShipyardForm.h" />
- <ClInclude Include="..\..\src\StringF.h" />
- <ClInclude Include="..\..\src\StringRange.h" />
- <ClInclude Include="..\..\src\SystemInfoView.h" />
- <ClInclude Include="..\..\src\SystemView.h" />
- <ClInclude Include="..\..\src\TerrainBody.h" />
- <ClInclude Include="..\..\src\utils.h" />
- <ClInclude Include="..\..\src\vector2.h" />
- <ClInclude Include="..\..\src\vector3.h" />
- <ClInclude Include="..\..\src\VideoLink.h" />
- <ClInclude Include="..\..\src\View.h" />
- <ClInclude Include="..\..\src\win32\pch.h" />
- <ClInclude Include="..\..\src\win32\TextUtils.h" />
- <ClInclude Include="..\..\src\win32\WinMath.h" />
- <ClInclude Include="..\..\src\WorldView.h" />
- <ClInclude Include="..\..\src\WorldViewCamera.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\src\Makefile.am" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="PreRelease|Win32">
+ <Configuration>PreRelease</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">