Changeset 9258 for code/trunk/src/modules/pong/PongScore.cc
- Timestamp:
- May 28, 2012, 2:25:03 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/pong/PongScore.cc
r9016 r9258 61 61 this->bShowRightPlayer_ = false; 62 62 this->player1_ = NULL; 63 63 this->player2_ = NULL; 64 64 } 65 65 … … 100 100 if (this->owner_ != NULL) 101 101 { 102 if(!this->owner_->hasEnded())102 if (!this->owner_->hasEnded()) 103 103 { 104 // get the two players104 // Get the two players. 105 105 player1_ = this->owner_->getLeftPlayer(); 106 106 player2_ = this->owner_->getRightPlayer(); 107 107 } 108 108 109 if(this->owner_->hasStarted()) 109 std::string name1; 110 std::string name2; 111 112 std::string score1("0"); 113 std::string score2("0"); 114 115 // Save the name and score of each player as a string. 116 if (player1_ != NULL) 110 117 { 111 // Get the two players. 118 name1 = player1_->getName(); 119 score1 = multi_cast<std::string>(this->owner_->getScore(player1_)); 120 } 121 if (player2_ != NULL) 122 { 123 name2 = player2_->getName(); 124 score2 = multi_cast<std::string>(this->owner_->getScore(player2_)); 125 } 112 126 113 std::string name1; 114 std::string name2; 127 // Assemble the strings, depending on what should all be displayed. 128 std::string output1; 129 if (this->bShowLeftPlayer_) 130 { 131 if (this->bShowName_ && this->bShowScore_ && player1_ != NULL) 132 output1 = name1 + " - " + score1; 133 else if (this->bShowScore_) 134 output1 = score1; 135 else if (this->bShowName_) 136 output1 = name1; 137 } 115 138 116 std::string score1("0"); 117 std::string score2("0"); 118 119 // Save the name and score of each player as a string. 120 if (player1_ != NULL) 121 { 122 name1 = player1_->getName(); 123 score1 = multi_cast<std::string>(this->owner_->getScore(player1_)); 124 } 125 if (player2_ != NULL) 126 { 127 name2 = player2_->getName(); 128 score2 = multi_cast<std::string>(this->owner_->getScore(player2_)); 129 } 130 131 // Assemble the strings, depending on what should all be displayed. 132 std::string output1; 133 if (this->bShowLeftPlayer_) 134 { 135 if (this->bShowName_ && this->bShowScore_ && player1_ != NULL) 136 output1 = name1 + " - " + score1; 137 else if (this->bShowScore_) 138 output1 = score1; 139 else if (this->bShowName_) 140 output1 = name1; 141 } 142 143 std::string output2; 144 if (this->bShowRightPlayer_) 145 { 139 std::string output2; 140 if (this->bShowRightPlayer_) 141 { 146 142 if (this->bShowName_ && this->bShowScore_ && player2_ != NULL) 147 143 output2 = score2 + " - " + name2; … … 152 148 } 153 149 154 std::string output("PONG"); 155 if (this->bShowName_ || this->bShowScore_) 156 { 157 if (this->bShowLeftPlayer_ && this->bShowRightPlayer_) 158 output = output1 + ':' + output2; 159 else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_) 160 output = output1 + output2; 161 } 162 this->setCaption(output); 150 std::string output("PONG"); 151 if (this->bShowName_ || this->bShowScore_) 152 { 153 if (this->bShowLeftPlayer_ && this->bShowRightPlayer_) 154 output = output1 + ':' + output2; 155 else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_) 156 output = output1 + output2; 163 157 } 158 159 this->setCaption(output); 164 160 } 165 161 }
Note: See TracChangeset
for help on using the changeset viewer.