summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-22 17:13:49 +0000
committerxazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-22 17:13:49 +0000
commit60fe89f05fdaaf600898c06f712282f0ac7b0387 (patch)
tree3f4aae43a624104d25ab856c0e3475166b244ff3
parent1bf0254f3bfc9a728814a32dc29759a784607520 (diff)
downloadhercules-60fe89f05fdaaf600898c06f712282f0ac7b0387.tar.gz
hercules-60fe89f05fdaaf600898c06f712282f0ac7b0387.tar.bz2
hercules-60fe89f05fdaaf600898c06f712282f0ac7b0387.tar.xz
hercules-60fe89f05fdaaf600898c06f712282f0ac7b0387.zip
Removed a redundant check. Rebranding a variable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15213 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/common/core.c20
-rw-r--r--src/map/pc.c4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/common/core.c b/src/common/core.c
index a6ddeb665..779401aa2 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -39,7 +39,7 @@ char **arg_v = NULL;
char *SERVER_NAME = NULL;
char SERVER_TYPE = ATHENA_SERVER_NONE;
#ifndef SVNVERSION
- static char eA_svn_version[10] = "";
+ static char rA_svn_version[10] = "";
#endif
#ifndef MINICORE // minimalist Core
@@ -141,8 +141,8 @@ const char* get_svn_revision(void)
{
FILE *fp;
- if(*eA_svn_version)
- return eA_svn_version;
+ if(*rA_svn_version)
+ return rA_svn_version;
if ((fp = fopen(".svn/entries", "r")) != NULL)
{
@@ -157,7 +157,7 @@ const char* get_svn_revision(void)
while (fgets(line,sizeof(line),fp))
if (strstr(line,"revision=")) break;
if (sscanf(line," %*[^\"]\"%d%*[^\n]", &rev) == 1) {
- snprintf(eA_svn_version, sizeof(eA_svn_version), "%d", rev);
+ snprintf(rA_svn_version, sizeof(rA_svn_version), "%d", rev);
}
}
else
@@ -167,7 +167,7 @@ const char* get_svn_revision(void)
fgets(line, sizeof(line), fp); // Get the entries kind
if(fgets(line, sizeof(line), fp)) // Get the rev numver
{
- snprintf(eA_svn_version, sizeof(eA_svn_version), "%d", atoi(line));
+ snprintf(rA_svn_version, sizeof(rA_svn_version), "%d", atoi(line));
}
}
}
@@ -177,7 +177,7 @@ const char* get_svn_revision(void)
* subversion 1.7 introduces the use of a .db file to store it, and we go through it
* TODO: In some cases it may be not accurate
**/
- if(!(*eA_svn_version) && ((fp = fopen(".svn/wc.db", "rb")) != NULL || (fp = fopen("../.svn/wc.db", "rb")) != NULL)) {
+ if(!(*rA_svn_version) && ((fp = fopen(".svn/wc.db", "rb")) != NULL || (fp = fopen("../.svn/wc.db", "rb")) != NULL)) {
char lines[64];
int revision,last_known = 0;
while(fread(lines, sizeof(char), sizeof(lines), fp)) {
@@ -191,15 +191,15 @@ const char* get_svn_revision(void)
}
fclose(fp);
if( last_known != 0 )
- snprintf(eA_svn_version, sizeof(eA_svn_version), "%d", last_known);
+ snprintf(rA_svn_version, sizeof(rA_svn_version), "%d", last_known);
}
/**
* we definitely didn't find it.
**/
- if(!(*eA_svn_version))
- snprintf(eA_svn_version, sizeof(eA_svn_version), "Unknown");
+ if(!(*rA_svn_version))
+ snprintf(rA_svn_version, sizeof(rA_svn_version), "Unknown");
- return eA_svn_version;
+ return rA_svn_version;
}
#endif
diff --git a/src/map/pc.c b/src/map/pc.c
index 32dfa6125..3bf509685 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5614,14 +5614,14 @@ int pc_resetskill(struct map_session_data* sd, int flag)
continue;
// Don't reset trick dead if not a novice/baby
- if( i == NV_TRICKDEAD && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE && (sd->class_&MAPID_UPPERMASK) != MAPID_BABY )
+ if( i == NV_TRICKDEAD && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE )
{
sd->status.skill[i].lv = 0;
sd->status.skill[i].flag = 0;
continue;
}
- if( i == NV_BASIC && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE && (sd->class_&MAPID_UPPERMASK) != MAPID_BABY )
+ if( i == NV_BASIC && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE )
{ // Official server does not include Basic Skill to be resetted. [Jobbie]
sd->status.skill[i].lv = 9;
sd->status.skill[i].flag = SKILL_FLAG_PERMANENT;