Merge branch 'master' of github.com:Allanis/Unuk

This commit is contained in:
Rtch90 2012-02-05 17:56:49 +00:00
commit 156322f4d6
2 changed files with 3 additions and 3 deletions

View File

@ -121,10 +121,10 @@ gameNavVal_t Game::Run(void) {
_playerHealthBar.SetProgress((float)_player->GetHealth() / 100.0f);
playerExp.str("");
playerExp << "Player Level " << _player->GetLevel() << " (" << _player->GetExp() << "/" << Player::EXP_TABLE[_player->GetLevel()] << ")";
playerExp << "Player Level " << _player->GetLevel() << " (" << _player->GetExp() << "/" << Player::EXP_TABLE[_player->GetLevel() - 1] << ")";
_playerExp.SetTextBlended(playerExp.str(), vsmall, COLOUR_WHITE);
_playerExpBar.SetProgress((float)_player->GetExp() / (float)Player::EXP_TABLE[_player->GetLevel()]);
_playerExpBar.SetProgress((float)_player->GetExp() / (float)Player::EXP_TABLE[_player->GetLevel() - 1]);
// Check to see if we are allowed to display debug info.
if(debugEnabled) {

View File

@ -269,7 +269,7 @@ findNext:
}
void LevelGen::GenerateEnemies(void) {
int npcsToGen = 4 + (rand() % 4);
int npcsToGen = 4 + (rand() % ((_player->GetLevel() * 2) + 4));
for(int i = 0; i < npcsToGen; i++) {
int spawnX;