agroschim/grenzland-mud
1
0
Fork 0
forked from kyonshi/grenzland-mud
Code Pull Requests Activity

Added protocols,lists and events, and fixed some bugs... refer to changelog.

Browse Source
This commit is contained in:
Vatiken
2012-02-12 22:07:50 +00:00
parent 6dadf24c51
commit dd280c1b58
22 changed files with 419 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/dg_event.c
View File

@@ -24,7 +24,7 @@
#include "dg_event.h"
#include "constants.h"
#include "comm.h" /* For access to the game pulse */
#include "mud_event.h"
/***************************************************************************
* Begin mud specific event queue functions
@@ -65,6 +65,7 @@ struct event *event_create(EVENTFUNC(*func), void *event_obj, long when)
new_event->func = func;
new_event->event_obj = event_obj;
new_event->q_el = queue_enq(event_q, new_event, when + pulse);
new_event->isMudEvent = FALSE;
return new_event;
}
@@ -85,10 +86,23 @@ void event_cancel(struct event *event)
queue_deq(event_q, event->q_el);
if (event->event_obj)
free(event->event_obj);
cleanup_event_obj(event);
free(event);
}
/* The memory freeing routine tied into the mud event system */
void cleanup_event_obj(struct event *event)
{
struct mud_event_data * mud_event;
if (event->isMudEvent) {
mud_event = (struct mud_event_data *) event->event_obj;
free_mud_event(mud_event);
} else
free(event->event_obj);
}
/** Process any events whose time has come. Should be called from, and at, every
* pulse of heartbeat. Re-enqueues multi-use events.
*/
@@ -314,7 +328,8 @@ void queue_free(struct dg_queue *q)
if ((event = (struct event *) qe->data) != NULL)
{
if (event->event_obj)
free(event->event_obj);
cleanup_event_obj(event);
free(event);
}
free(qe);