[Orxonox-commit 7618] r12211 - in code/branches/Boxhead_FS19: data/levels/includes src/modules/hover
cwaupoti at orxonox.net
cwaupoti at orxonox.net
Thu Mar 14 16:03:00 CET 2019
Author: cwaupoti
Date: 2019-03-14 16:03:00 +0100 (Thu, 14 Mar 2019)
New Revision: 12211
Modified:
code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi
code/branches/Boxhead_FS19/src/modules/hover/Hover.cc
Log:
removed walls, added ice gun
Modified: code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi
===================================================================
--- code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi 2019-03-14 15:01:59 UTC (rev 12210)
+++ code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi 2019-03-14 15:03:00 UTC (rev 12211)
@@ -6,7 +6,7 @@
<WeaponSet firemode=0 />
<WeaponSet firemode=1 />
</weaponsets>
-<!--<weaponpacks>
+<weaponpacks>
<WeaponPack>
<links>
<DefaultWeaponmodeLink firemode=0 weaponmode=0 />
@@ -24,7 +24,7 @@
<DefaultWeaponmodeLink firemode=1 weaponmode=0 />
</links>
</WeaponPack>
-</weaponpacks> -->
+</weaponpacks>
<munition>
<IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
</munition>
Modified: code/branches/Boxhead_FS19/src/modules/hover/Hover.cc
===================================================================
--- code/branches/Boxhead_FS19/src/modules/hover/Hover.cc 2019-03-14 15:01:59 UTC (rev 12210)
+++ code/branches/Boxhead_FS19/src/modules/hover/Hover.cc 2019-03-14 15:03:00 UTC (rev 12211)
@@ -81,17 +81,17 @@
}
//Generate inner Walls according to levelcode
- for(int y=0; y<numCells; y++){
- for(int x=0; x<numCells; x++){
- switch(levelcode[ y * numCells + x ]){
- case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
- break;
- case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
- case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
- default: break;
- }
- }
- }
+ // for(int y=0; y<numCells; y++){
+ // for(int x=0; x<numCells; x++){
+ // switch(levelcode[ y * numCells + x ]){
+ // case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
+ // break;
+ // case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
+ // case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
+ // default: break;
+ // }
+ // }
+ // }
//Generate 5 flags randomly
for ( int i = 0; i < 5; i++ )
More information about the Orxonox-commit
mailing list