summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battleground.c2
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/instance.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c
index 4bb6035ad..bfcd56d8e 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -598,7 +598,7 @@ enum BATTLEGROUNDS_QUEUE_ACK bg_canqueue(struct map_session_data *sd, struct bg_
if ( !(sd->class_&JOBL_2) ) /* TODO: maybe make this a per-arena setting, so users may make custom arenas like baby-only,whatever. */
return BGQA_FAIL_CLASS_INVALID;
- tsec = time(NULL);
+ tsec = (unsigned int)time(NULL);
if ( ( tick = pc_readglobalreg(sd, bg->gdelay_var) ) && tsec < tick ) {
char response[100];
diff --git a/src/map/clif.c b/src/map/clif.c
index 99b4d8c11..b73c7ac31 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -15569,7 +15569,7 @@ void clif_font(struct map_session_data *sd)
* Instancing Window
*------------------------------------------*/
int clif_instance(int instance_id, int type, int flag) {
- struct map_session_data *sd;
+ struct map_session_data *sd = NULL;
unsigned char buf[255];
enum send_target target = PARTY;
diff --git a/src/map/instance.c b/src/map/instance.c
index 7b3e2e800..637e768c9 100644
--- a/src/map/instance.c
+++ b/src/map/instance.c
@@ -491,7 +491,7 @@ void instance_check_idle(int instance_id) {
*--------------------------------------*/
void instance_set_timeout(int instance_id, unsigned int progress_timeout, unsigned int idle_timeout)
{
- unsigned int now = time(0);
+ unsigned int now = (unsigned int)time(0);
if( !instance->valid(instance_id) )
return;