Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Unuk/Game.cpp
View File

@ -121,10 +121,10 @@ gameNavVal_t Game::Run(void) {
_playerHealthBar.SetProgress((float)_player->GetHealth() / 100.0f); _playerHealthBar.SetProgress((float)_player->GetHealth() / 100.0f);
playerExp.str(""); 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); _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. // Check to see if we are allowed to display debug info.
if(debugEnabled) { if(debugEnabled) {

2
src/libUnuk/LevelGen/LevelGen.cpp
View File

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