summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/map/duel.c19
-rw-r--r--src/map/duel.h12
-rw-r--r--src/map/guild.c12
-rw-r--r--src/map/guild.h8
4 files changed, 20 insertions, 31 deletions
diff --git a/src/map/duel.c b/src/map/duel.c
index ac1297bd5..c13d004b0 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -28,7 +28,6 @@ void duel_savetime(struct map_session_data* sd)
t = localtime(&timer);
pc_setglobalreg(sd, "PC_LAST_DUEL_TIME", t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min);
- return;
}
int duel_checktime(struct map_session_data* sd)
@@ -57,7 +56,7 @@ static int duel_showinfo_sub(struct map_session_data* sd, va_list va)
return 1;
}
-int duel_showinfo(const unsigned int did, struct map_session_data* sd)
+void duel_showinfo(const unsigned int did, struct map_session_data* sd)
{
int p=0;
char output[256];
@@ -76,7 +75,6 @@ int duel_showinfo(const unsigned int did, struct map_session_data* sd)
clif_disp_onlyself(sd, output, strlen(output));
map_foreachpc(duel_showinfo_sub, sd, &p);
- return 0;
}
int duel_create(struct map_session_data* sd, const unsigned int maxpl)
@@ -101,7 +99,7 @@ int duel_create(struct map_session_data* sd, const unsigned int maxpl)
return i;
}
-int duel_invite(const unsigned int did, struct map_session_data* sd, struct map_session_data* target_sd)
+void duel_invite(const unsigned int did, struct map_session_data* sd, struct map_session_data* target_sd)
{
char output[256];
@@ -115,7 +113,6 @@ int duel_invite(const unsigned int did, struct map_session_data* sd, struct map_
// "Blue -- Player %s invites you to PVP duel (@accept/@reject) --"
sprintf(output, msg_txt(374), sd->status.name);
clif_broadcast((struct block_list *)target_sd, output, strlen(output)+1, 0x10, SELF);
- return 0;
}
static int duel_leave_sub(struct map_session_data* sd, va_list va)
@@ -126,7 +123,7 @@ static int duel_leave_sub(struct map_session_data* sd, va_list va)
return 0;
}
-int duel_leave(const unsigned int did, struct map_session_data* sd)
+void duel_leave(const unsigned int did, struct map_session_data* sd)
{
char output[256];
@@ -144,10 +141,9 @@ int duel_leave(const unsigned int did, struct map_session_data* sd)
sd->duel_group = 0;
duel_savetime(sd);
clif_map_property(sd, MAPPROPERTY_NOTHING);
- return 0;
}
-int duel_accept(const unsigned int did, struct map_session_data* sd)
+void duel_accept(const unsigned int did, struct map_session_data* sd)
{
char output[256];
@@ -162,10 +158,9 @@ int duel_accept(const unsigned int did, struct map_session_data* sd)
clif_map_property(sd, MAPPROPERTY_FREEPVPZONE);
//clif_misceffect2(&sd->bl, 159);
- return 0;
}
-int duel_reject(const unsigned int did, struct map_session_data* sd)
+void duel_reject(const unsigned int did, struct map_session_data* sd)
{
char output[256];
@@ -175,15 +170,13 @@ int duel_reject(const unsigned int did, struct map_session_data* sd)
duel_list[did].invites_count--;
sd->duel_invite = 0;
- return 0;
}
void do_final_duel(void)
{
}
-int do_init_duel(void)
+void do_init_duel(void)
{
memset(&duel_list[0], 0, sizeof(duel_list));
- return 0;
}
diff --git a/src/map/duel.h b/src/map/duel.h
index 674d0e12f..04d8e4e84 100644
--- a/src/map/duel.h
+++ b/src/map/duel.h
@@ -16,14 +16,14 @@ extern int duel_count;
//Duel functions // [LuzZza]
int duel_create(struct map_session_data* sd, const unsigned int maxpl);
-int duel_invite(const unsigned int did, struct map_session_data* sd, struct map_session_data* target_sd);
-int duel_accept(const unsigned int did, struct map_session_data* sd);
-int duel_reject(const unsigned int did, struct map_session_data* sd);
-int duel_leave(const unsigned int did, struct map_session_data* sd);
-int duel_showinfo(const unsigned int did, struct map_session_data* sd);
+void duel_invite(const unsigned int did, struct map_session_data* sd, struct map_session_data* target_sd);
+void duel_accept(const unsigned int did, struct map_session_data* sd);
+void duel_reject(const unsigned int did, struct map_session_data* sd);
+void duel_leave(const unsigned int did, struct map_session_data* sd);
+void duel_showinfo(const unsigned int did, struct map_session_data* sd);
int duel_checktime(struct map_session_data* sd);
-int do_init_duel(void);
+void do_init_duel(void);
void do_final_duel(void);
#endif /* _DUEL_H_ */
diff --git a/src/map/guild.c b/src/map/guild.c
index 90f9c4a88..eb9dfbd01 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1969,41 +1969,37 @@ int guild_castledataloadack(int len, struct guild_castle *gc)
/*====================================================
* Start normal woe and triggers all npc OnAgitStart
*---------------------------------------------------*/
-int guild_agit_start(void)
+void guild_agit_start(void)
{ // Run All NPC_Event[OnAgitStart]
int c = npc_event_doall("OnAgitStart");
ShowStatus("NPC_Event:[OnAgitStart] Run (%d) Events by @AgitStart.\n",c);
- return 0;
}
/*====================================================
* End normal woe and triggers all npc OnAgitEnd
*---------------------------------------------------*/
-int guild_agit_end(void)
+void guild_agit_end(void)
{ // Run All NPC_Event[OnAgitEnd]
int c = npc_event_doall("OnAgitEnd");
ShowStatus("NPC_Event:[OnAgitEnd] Run (%d) Events by @AgitEnd.\n",c);
- return 0;
}
/*====================================================
* Start woe2 and triggers all npc OnAgitStart2
*---------------------------------------------------*/
-int guild_agit2_start(void)
+void guild_agit2_start(void)
{ // Run All NPC_Event[OnAgitStart2]
int c = npc_event_doall("OnAgitStart2");
ShowStatus("NPC_Event:[OnAgitStart2] Run (%d) Events by @AgitStart2.\n",c);
- return 0;
}
/*====================================================
* End woe2 and triggers all npc OnAgitEnd2
*---------------------------------------------------*/
-int guild_agit2_end(void)
+void guild_agit2_end(void)
{ // Run All NPC_Event[OnAgitEnd2]
int c = npc_event_doall("OnAgitEnd2");
ShowStatus("NPC_Event:[OnAgitEnd2] Run (%d) Events by @AgitEnd2.\n",c);
- return 0;
}
// How many castles does this guild have?
diff --git a/src/map/guild.h b/src/map/guild.h
index 9ff74e0a3..0773063ef 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -95,11 +95,11 @@ int guild_castledatasave(int castle_id,int index,int value);
int guild_castledataloadack(int len, struct guild_castle *gc);
void guild_castle_reconnect(int castle_id, int index, int value);
-int guild_agit_start(void);
-int guild_agit_end(void);
+void guild_agit_start(void);
+void guild_agit_end(void);
-int guild_agit2_start(void);
-int guild_agit2_end(void);
+void guild_agit2_start(void);
+void guild_agit2_end(void);
void guild_guildaura_refresh(struct map_session_data *sd, int skill_num, int skill_lv);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-11 08:16:01 +0000