[Orxonox-commit 7345] r11962 - in code/branches/Masterserver_FS18: data/levels src/modules/overlays/hud

[varyo at orxonox.net]

Author: varyo
Date: 2018-05-17 13:30:14 +0200 (Thu, 17 May 2018)
New Revision: 11962

Modified:
   code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw
   code/branches/Masterserver_FS18/src/modules/overlays/hud/HUDWeaponSystem.cc
Log:
updated Multiplayer map

Modified: code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw
===================================================================
--- code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw	2018-05-14 11:08:06 UTC (rev 11961)
+++ code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw	2018-05-17 11:30:14 UTC (rev 11962)
@@ -58,6 +58,7 @@
 <!-- ---------------asteroid dome----------------- -->
 <?lua
 max = 16
+fac = 0.3
 for i = 0, max, 1
 do
     y = math.sin(i/max*6)*750
@@ -65,9 +66,11 @@
     j = 1
     ?>
 
+
     <TeamSpawnPoint team=0 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <TeamSpawnPoint team=1 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+    <TeamSpawnPoint team=1 position="<?lua print(y*1.4*fac+z*0.2*fac) ?>,0,<?lua print(z*1.4*fac-y*0.2*fac) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
 
+
     <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
       <attached>
         <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">

Modified: code/branches/Masterserver_FS18/src/modules/overlays/hud/HUDWeaponSystem.cc
===================================================================
--- code/branches/Masterserver_FS18/src/modules/overlays/hud/HUDWeaponSystem.cc	2018-05-14 11:08:06 UTC (rev 11961)
+++ code/branches/Masterserver_FS18/src/modules/overlays/hud/HUDWeaponSystem.cc	2018-05-17 11:30:14 UTC (rev 11962)
@@ -1,4 +1,4 @@
-/*
+w/*
  *   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <
  *