summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-31 16:37:16 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-31 16:37:16 +0000
commited3c7c94d75951a75cf19a313cb8eb27cb2ffac9 (patch)
tree3fb7faa7f6ae6691995587f1cd7a794b5e22e9b2 /src
parent63c083ffc7f186576d69158f6e1ff7f3c893d7b3 (diff)
downloadhercules-ed3c7c94d75951a75cf19a313cb8eb27cb2ffac9.tar.gz
hercules-ed3c7c94d75951a75cf19a313cb8eb27cb2ffac9.tar.bz2
hercules-ed3c7c94d75951a75cf19a313cb8eb27cb2ffac9.tar.xz
hercules-ed3c7c94d75951a75cf19a313cb8eb27cb2ffac9.zip
Commented out msg_athena.conf strings disabled in r11625.
Reverted changes in r11625 that used enum sc_type where it shouldn't have been used. Removed leftover npc/other/arena.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11627 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/pet.c3
-rw-r--r--src/map/status.c19
-rw-r--r--src/map/status.h4
-rw-r--r--src/plugins/console.c2
-rw-r--r--src/tool/adduser.c2
-rw-r--r--src/tool/convert.c2
7 files changed, 21 insertions, 13 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index d5eec4f56..1d254cf8d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7626,7 +7626,7 @@ void clif_feel_hate_reset(struct map_session_data *sd)
WFIFOSET(fd, packet_len(0x20e));
}
-/// Validates one global/guild/party/whisper message packet to and tries to recognize its components.
+/// Validates one global/guild/party/whisper message packet and tries to recognize its components.
/// Returns true if the packet was parsed successfully.
/// Formats: 0 - <packet id>.w <packet len>.w (<name> : <message>).?B 00
/// 1 - <packet id>.w <packet len>.w <name>.24B <message>.?B 00
diff --git a/src/map/pet.c b/src/map/pet.c
index 606e29d31..64424d7f1 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1359,7 +1359,8 @@ int do_init_pet(void)
return 0;
}
-int do_final_pet(void) {
+int do_final_pet(void)
+{
int i;
for( i = 0; i < MAX_PET_DB; i++ ) {
if(pet_db[i].script) {
diff --git a/src/map/status.c b/src/map/status.c
index 75c877140..6919a47bb 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6100,11 +6100,15 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
}
/*==========================================
* ステータス異常全解除
+ * type:
+ * 0 - ???
+ * 1 - ???
+ * 2 - ???
*------------------------------------------*/
-int status_change_clear(struct block_list* bl, enum sc_type type)
+int status_change_clear(struct block_list* bl, int type)
{
struct status_change* sc;
- int i;
+ enum sc_type i;
sc = status_get_sc(bl);
@@ -6118,9 +6122,10 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
{
if(sc->data[i].timer == -1)
continue;
+
if(type == 0)
switch (i)
- { //Type 0: PC killed -> Place here stats that do not dispel on death.
+ { //Type 0: PC killed -> Place here statuses that do not dispel on death.
case SC_EDP:
case SC_MELTDOWN:
case SC_XMAS:
@@ -6136,6 +6141,7 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
case SC_JAILED:
continue;
}
+
status_change_end(bl, i, INVALID_TIMER);
if( type == 1 && sc->data[i].timer != INVALID_TIMER )
@@ -6145,12 +6151,13 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
sc->data[i].timer = -1;
}
}
+
sc->opt1 = 0;
sc->opt2 = 0;
sc->opt3 = 0;
sc->option &= OPTION_MASK;
- if(!type || type&2)
+ if( type == 0 || type == 2 )
clif_changeoption(bl);
return 1;
@@ -7025,9 +7032,9 @@ int status_change_timer_sub(struct block_list* bl, va_list ap)
* Clears buffs/debuffs of a character.
* type&1 -> buffs, type&2 -> debuffs
*------------------------------------------*/
-int status_change_clear_buffs (struct block_list* bl, enum sc_type type)
+int status_change_clear_buffs (struct block_list* bl, int type)
{
- int i;
+ enum sc_type i;
struct status_change *sc= status_get_sc(bl);
if (!sc || !sc->count)
diff --git a/src/map/status.h b/src/map/status.h
index 074425de6..a610ed120 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -670,8 +670,8 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid);
int kaahi_heal_timer(int tid, unsigned int tick, int id, int data);
int status_change_timer(int tid, unsigned int tick, int id, int data);
int status_change_timer_sub(struct block_list* bl, va_list ap);
-int status_change_clear(struct block_list* bl, enum sc_type type);
-int status_change_clear_buffs(struct block_list* bl, enum sc_type type);
+int status_change_clear(struct block_list* bl, int type);
+int status_change_clear_buffs(struct block_list* bl, int type);
void status_calc_bl(struct block_list *bl, unsigned long flag);
int status_calc_pet(struct pet_data* pd, int first); // [Skotlex]
diff --git a/src/plugins/console.c b/src/plugins/console.c
index 5374d784f..549091f12 100644
--- a/src/plugins/console.c
+++ b/src/plugins/console.c
@@ -53,7 +53,7 @@ typedef struct _buffer {
/// In linux the worker is a process so it needs to comunicate through pipes.
#define WORKER_FUNC_DECLARE(name) void worker_ ## name(void)
#define WORKER_FUNC_START(name) void worker_ ## name(void) {
-#define WORKER_FUNC_END(name) _exit(0); }
+#define WORKER_FUNC_END(name) _exit(EXIT_SUCCESS); }
#define WORKER_EXECUTE(name,errvar) \
do{ \
int pid = fork(); \
diff --git a/src/tool/adduser.c b/src/tool/adduser.c
index 1140bd6ff..8e7c5f0c2 100644
--- a/src/tool/adduser.c
+++ b/src/tool/adduser.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
if (FPaccin == NULL) {
printf("'%s' file not found!\n", account_txt);
printf("Run the setup wizard please.\n");
- exit(0);
+ exit(EXIT_SUCCESS);
}
next_id = 2000000;
diff --git a/src/tool/convert.c b/src/tool/convert.c
index 863a282dc..671a49fb7 100644
--- a/src/tool/convert.c
+++ b/src/tool/convert.c
@@ -292,7 +292,7 @@ int main(int argc,char *argv[])
{
if(argc < 3) {
printf("Usage: convert <input filename> <output filename>\n");
- exit(0);
+ exit(EXIT_SUCCESS);
}
mmo_char_convert(argv[1],argv[2]);