summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game.cpp19
-rw-r--r--src/gui/status.cpp4
2 files changed, 12 insertions, 11 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 4aed4893..3a0f5c80 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -630,9 +630,6 @@ void do_parse() {
case 0x0008:
char_info->max_sp = RFIFOW(4);
break;
- case 0x0009:
- char_info->statsPointsToAttribute = RFIFOW(4);
- break;
case 0x000b:
char_info->lv = RFIFOW(4);
break;
@@ -640,15 +637,12 @@ void do_parse() {
char_info->skill_point = RFIFOW(4);
skillDialog->setPoints(char_info->skill_point);
break;
- case 0x0016:
- char_info->xpForNextLevel = RFIFOW(4);
- break;
- case 0x0017:
- char_info->jobXpForNextLevel = RFIFOW(4);
- break;
case 0x0037:
char_info->job_lv = RFIFOW(4);
break;
+ case 0x0009:
+ char_info->statsPointsToAttribute = RFIFOL(4);
+ break;
}
statusWindow->update();
if(char_info->hp==0) {
@@ -735,6 +729,13 @@ void do_parse() {
char_info->gp = RFIFOL(4);
break;
// case 16 and 17 missing
+
+ case 0x0016:
+ char_info->xpForNextLevel = RFIFOL(4);
+ break;
+ case 0x0017:
+ char_info->jobXpForNextLevel = RFIFOL(4);
+ break;
}
break;
// Level up
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 12d4270c..ec2d4b16 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -99,11 +99,11 @@ void StatusWindow::update()
spValue->setCaption(tempstr);
spValue->adjustSize();
- sprintf(tempstr, "Exp: %d", (int)char_info->xp);
+ sprintf(tempstr, "Exp: %d / %d", (int)char_info->xp, (int)char_info->xpForNextLevel);
expLabel->setCaption(tempstr);
expLabel->adjustSize();
- sprintf(tempstr, "Job Exp: %d", (int)char_info->job_xp);
+ sprintf(tempstr, "Job Exp: %d / %d", (int)char_info->job_xp, (int)char_info->jobXpForNextLevel);
jobExpLabel->setCaption(tempstr);
jobExpLabel->adjustSize();