[Orxonox-commit 7146] r11763 - in code/branches/Presentation_HS17_merge: data/levels src/modules/flappyorx
landauf at orxonox.net
landauf at orxonox.net
Sun Feb 18 01:13:20 CET 2018
Author: landauf
Date: 2018-02-18 01:13:20 +0100 (Sun, 18 Feb 2018)
New Revision: 11763
Modified:
code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw
code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc
Log:
[FlappyOrx_HS17] found better solution to avoid warning when loading level
Modified: code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw 2018-02-18 00:02:47 UTC (rev 11762)
+++ code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw 2018-02-18 00:13:20 UTC (rev 11763)
@@ -6,7 +6,6 @@
/>
<?lua
- include("stats.oxo")
include("templates/lodInformation.oxt")
include("templates/spaceshipFlappyOrx.oxt")
include("overlays/FlappyOrxHUD.oxo")
Modified: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc 2018-02-18 00:02:47 UTC (rev 11762)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc 2018-02-18 00:13:20 UTC (rev 11763)
@@ -74,6 +74,7 @@
circlesUsed=0;
setHUDTemplate("FlappyOrxHUD");
+ scoreboardTemplate_ = "";
}
void FlappyOrx::updatePlayerPos(float x){
More information about the Orxonox-commit
mailing list