[Orxonox-commit 2937] r7637 - in code/branches/lastmanstanding: data/overlays src/modules/overlays/hud
landauf at orxonox.net
landauf at orxonox.net
Thu Nov 11 01:46:59 CET 2010
Author: landauf
Date: 2010-11-11 01:46:59 +0100 (Thu, 11 Nov 2010)
New Revision: 7637
Modified:
code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo
code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc
code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h
Log:
eol-style native
Modified: code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo
===================================================================
--- code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo 2010-11-11 00:35:49 UTC (rev 7636)
+++ code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo 2010-11-11 00:46:59 UTC (rev 7637)
@@ -1,85 +1,85 @@
-<Template name="LastmanstandingHUD">
- <OverlayGroup name="DynamicmatcHUD" scale = "1, 1">
-
- <GametypeStaticMessage
- name = "staticmessage"
- position = "0.5, 0.01"
- font = "VeraMono"
- caption = ""
- textsize = 0.033
- colour = "1.0, 1.0, 0.5, 1.0"
- align = "center"
- />
-
-<GametypeFadingMessage
- name = "fadingmessage"
- position = "0.5, 0.05"
- font = "VeraMono"
- textsize = 0.04
- colour = "1.0, 1.0, 0.5, 1.0"
- align = "center"
- />
- <LastManStandingInfos
- position = "0.63, 0.05"
- pickpoint = "0.0, 0.0"
- font = "ShareTechMono"
- textsize = 0.04
- colour = "0.8, 0.8, 1.0, 1.0"
- align = "right"
-
- showlives = true
- showplayers = false
- />
-
- <OverlayText
- position = "0.02, 0.02"
- pickpoint = "0.0, 0.0"
- font = "ShareTechMono"
- textsize = 0.04
- colour = "1.0, 1.0, 1.0, 1.0"
- align = "left"
- caption = "Lives: "
- />
-
- <OverlayText
- position = "0.02, 0.055"
- pickpoint = "0.0, 0.0"
- font = "ShareTechMono"
- textsize = 0.04
- colour = "1.0, 1.0, 1.0, 1.0"
- align = "left"
- caption = "Players: "
- />
-
- <OverlayText
- position = "0.02, 0.07"
- pickpoint = "0.0, 0.0"
- font = "ShareTechMono"
- textsize = 0.04
- colour = "1.0, 1.0, 1.0, 1.0"
- align = "left"
- caption = "__________|"
- />
-
- <OverlayText
- position = "0.022, 0.07"
- pickpoint = "0.0, 0.0"
- font = "ShareTechMono"
- textsize = 0.04
- colour = "1.0, 1.0, 1.0, 1.0"
- align = "left"
- caption = "__________"
- />
-
- <OverlayText
- position = "0.1733, 0.038"
- pickpoint = "0.0, 0.0"
- font = "ShareTechMono"
- textsize = 0.04
- colour = "1.0, 1.0, 1.0, 1.0"
- align = "left"
- caption = "|"
- />
-
- </OverlayGroup>
-</Template>
+<Template name="LastmanstandingHUD">
+ <OverlayGroup name="DynamicmatcHUD" scale = "1, 1">
+
+ <GametypeStaticMessage
+ name = "staticmessage"
+ position = "0.5, 0.01"
+ font = "VeraMono"
+ caption = ""
+ textsize = 0.033
+ colour = "1.0, 1.0, 0.5, 1.0"
+ align = "center"
+ />
+
+<GametypeFadingMessage
+ name = "fadingmessage"
+ position = "0.5, 0.05"
+ font = "VeraMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 0.5, 1.0"
+ align = "center"
+ />
+ <LastManStandingInfos
+ position = "0.63, 0.05"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "0.8, 0.8, 1.0, 1.0"
+ align = "right"
+
+ showlives = true
+ showplayers = false
+ />
+
+ <OverlayText
+ position = "0.02, 0.02"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "Lives: "
+ />
+
+ <OverlayText
+ position = "0.02, 0.055"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "Players: "
+ />
+
+ <OverlayText
+ position = "0.02, 0.07"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "__________|"
+ />
+
+ <OverlayText
+ position = "0.022, 0.07"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "__________"
+ />
+
+ <OverlayText
+ position = "0.1733, 0.038"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "|"
+ />
+
+ </OverlayGroup>
+</Template>
Property changes on: code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc
===================================================================
--- code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc 2010-11-11 00:35:49 UTC (rev 7636)
+++ code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc 2010-11-11 00:46:59 UTC (rev 7637)
@@ -42,7 +42,7 @@
{
RegisterObject(LastManStandingInfos);
- this->lms_ = 0;
+ this->lms_ = 0;
this->player_ = 0;
this->bShowLives_ = false;
this->bShowPlayers_ = false;
@@ -77,21 +77,21 @@
this->setCaption(players);
}
}
- }
-
- void LastManStandingInfos::changedOwner()
- {
- SUPER(LastManStandingInfos, changedOwner);
-
- if (this->getOwner() && this->getOwner()->getGametype())
- {
- this->player_ = orxonox_cast<PlayerInfo*>(this->getOwner());
- this->lms_ = orxonox_cast<LastManStanding*>(this->getOwner()->getGametype().get());
- }
- else
- {
- this->player_ = 0;
- this->lms_ = 0;
- }
}
+
+ void LastManStandingInfos::changedOwner()
+ {
+ SUPER(LastManStandingInfos, changedOwner);
+
+ if (this->getOwner() && this->getOwner()->getGametype())
+ {
+ this->player_ = orxonox_cast<PlayerInfo*>(this->getOwner());
+ this->lms_ = orxonox_cast<LastManStanding*>(this->getOwner()->getGametype().get());
+ }
+ else
+ {
+ this->player_ = 0;
+ this->lms_ = 0;
+ }
+ }
}
Property changes on: code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h
===================================================================
--- code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h 2010-11-11 00:35:49 UTC (rev 7636)
+++ code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h 2010-11-11 00:46:59 UTC (rev 7637)
@@ -43,7 +43,7 @@
virtual ~LastManStandingInfos();
virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual void changedOwner();
inline void setShowLives(bool value)
@@ -58,7 +58,7 @@
private:
LastManStanding* lms_;
- PlayerInfo* player_;
+ PlayerInfo* player_;
bool bShowLives_;
bool bShowPlayers_;
};
Property changes on: code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list