Changeset 12173 for code/branches/wagnis_HS18/src

Timestamp:

Dec 8, 2018, 6:04:56 PM (6 years ago)

Author:

stadlero

Message:

Continent color Billboards and arrows added.

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• Wagnis.cc (modified) (4 diffs)
• Wagnis.h (modified) (1 diff)

code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc

@@ -18 +18 @@
     this->initial_reinforcements_left = 2; //changed here
 
-    int n = 6;
+    int n = 4;
     for(int i = 0;i < n;i++){
         WagnisPlayer* p = new WagnisPlayer(context);
@@ -74 +74 @@
                 //Still empty provinces left
 
-                if(this->active_player < this->players.size()){
+                if(this->active_player < (int)this->players.size()){
                     this->active_player++;
                 }else{
@@ -101 +101 @@
             if(this->initial_reinforcements_left > 0){
                 player->setActive(false);
-                if(this->active_player == this->players.size()){
+                if(this->active_player == (int)this->players.size()){
                     //Last player finished this round of initial troops.
                     this->initial_reinforcements_left -= 1;
@@ -142 +142 @@
             int tc;
             do{
-                if(this->active_player < this->players.size()){
+                if(this->active_player < (int)this->players.size()){
                     this->active_player++;
                 }else{

code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Authors:
+ *  
+ *   Co-authors:
+ *      ...
+ *
+ */