*** empty log message ***

6 files changed, 7 insertions, 7 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 9c343f49..44e8a9fc 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -619,7 +619,7 @@ void do_parse() {
 							char_info->job_xp = RFIFOL(4);
 							break;
 						case 20:
-							char_info->zeny = RFIFOL(4);
+							char_info->gp = RFIFOL(4);
 							break;
 						// case 16 and 17 missing
 					}
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 052ec402..cbd0a9da 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -226,8 +226,8 @@ void do_graphic(void) {
       if(node->action!=STAND) {
         node->frame = (get_elapsed_time(node->tick_time)*4)/(node->speed);
         if(node->frame>=4) {
-          if(node->action!=MONSTER_DEAD) {
-						if(node->path->next  && node->action!=MONSTER_DEAD) {
+					if(node->action!=MONSTER_DEAD && node->path) {
+						if(node->path->next) {
               PATH_NODE *old = node->path;
 							node->path = node->path->next;
 							direction = 0;
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 056cd724..d7bc805d 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -198,7 +198,7 @@ void server_char_delete() {
         char_info->job_xp = RFIFOL(2+12);
 				char_info->lv = RFIFOW(2+58);
 				char_info->xp = RFIFOL(2+4);
-				char_info->zeny = RFIFOL(2+8);
+				char_info->gp = RFIFOL(2+8);
 				char_info->STR = RFIFOB(2+98);
 				char_info->AGI = RFIFOB(2+99);
 				char_info->VIT = RFIFOB(2+100);
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 1d28bad7..63656f78 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -101,7 +101,7 @@ void server_char_server() {
 			char_info[i].hp = RFIFOW(24+106*i+42);
 			char_info[i].max_hp = RFIFOW(24+106*i+44);
 			char_info[i].xp = RFIFOL(24+106*i+4);
-			char_info[i].zeny = RFIFOL(24+106*i+8);
+			char_info[i].gp = RFIFOL(24+106*i+8);
 			char_info[i].job_xp = RFIFOL(24+106*i+16);
 			char_info[i].job_lv = RFIFOL(24+106*i+24);
 			char_info[i].sp = RFIFOW(24+106*i+46);
diff --git a/src/gui/stats.cpp b/src/gui/stats.cpp
index 4b63c9d5..5cdbea8f 100644
--- a/src/gui/stats.cpp
+++ b/src/gui/stats.cpp
@@ -45,7 +45,7 @@ DIALOG stats_dialog[] = {
 void update_stats_dialog() {
 	sprintf(stats_name, "%s Lvl: % 2i Job: % 2i", char_info->name, char_info->lv, char_info->job_lv);
 	sprintf(stats_hp,   "HP % 4d / % 4d",         char_info->hp, char_info->max_hp);
-	sprintf(stats_zeny, "Zeny % 5i",              char_info->zeny);
+	sprintf(stats_zeny, "GP % 5i",                char_info->zeny);
 	sprintf(stats_sp,   "SP % 4d / % 4d",         char_info->sp, char_info->max_sp);
 	stats_dialog[2].d1 = char_info->hp;
 	stats_dialog[2].d2 = char_info->max_hp;
diff --git a/src/main.h b/src/main.h
index 825cc7ef..27b31040 100644
--- a/src/main.h
+++ b/src/main.h
@@ -63,7 +63,7 @@ typedef struct {
 	int id;
 	char name[24];
 	short hp, max_hp, sp, max_sp, lv;
-	int xp, zeny, job_xp, job_lv;
+	int xp, gp, job_xp, job_lv;
 	short statp, skillp;
 	char STR, AGI, VIT, INT, DEX, LUK;
 } PLAYER_INFO;