kyonshi/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-03-02 15:31:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor adjustments, and small 10 Dir bug fix

Browse Source
This commit is contained in:
Vatiken
2012-02-20 20:25:24 +00:00
parent ad3bb8bc64
commit 47f7ad955f
4 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/act.movement.c
View File

@@ -342,7 +342,7 @@ int perform_move(struct char_data *ch, int dir, int need_specials_check)
room_rnum was_in; room_rnum was_in;
struct follow_type *k, *next; struct follow_type *k, *next;
if (ch == NULL || dir < 0 || dir >= DIR_COUNT || FIGHTING(ch)) if (ch == NULL || dir < 0 || dir >= NUM_OF_DIRS || FIGHTING(ch))
return (0); return (0);
else if (!CONFIG_DIAGONAL_DIRS && IS_DIAGONAL(dir)) else if (!CONFIG_DIAGONAL_DIRS && IS_DIAGONAL(dir))
send_to_char(ch, "Alas, you cannot go that way...\r\n"); send_to_char(ch, "Alas, you cannot go that way...\r\n");

6
src/interpreter.c
View File

@@ -72,6 +72,12 @@ cpp_extern const struct command_info cmd_info[] = {
{ "west" , "w" , POS_STANDING, do_move , 0, SCMD_WEST }, { "west" , "w" , POS_STANDING, do_move , 0, SCMD_WEST },
{ "up" , "u" , POS_STANDING, do_move , 0, SCMD_UP }, { "up" , "u" , POS_STANDING, do_move , 0, SCMD_UP },
{ "down" , "d" , POS_STANDING, do_move , 0, SCMD_DOWN }, { "down" , "d" , POS_STANDING, do_move , 0, SCMD_DOWN },
{ "north" , "n" , POS_STANDING, do_move , 0, SCMD_NORTH },
{ "east" , "e" , POS_STANDING, do_move , 0, SCMD_EAST },
{ "south" , "s" , POS_STANDING, do_move , 0, SCMD_SOUTH },
{ "west" , "w" , POS_STANDING, do_move , 0, SCMD_WEST },
{ "up" , "u" , POS_STANDING, do_move , 0, SCMD_UP },
{ "down" , "d" , POS_STANDING, do_move , 0, SCMD_DOWN },
{ "northwest", "northw" , POS_STANDING, do_move , 0, SCMD_NW }, { "northwest", "northw" , POS_STANDING, do_move , 0, SCMD_NW },
{ "nw" , "nw" , POS_STANDING, do_move , 0, SCMD_NW }, { "nw" , "nw" , POS_STANDING, do_move , 0, SCMD_NW },
{ "northeast", "northe" , POS_STANDING, do_move , 0, SCMD_NE }, { "northeast", "northe" , POS_STANDING, do_move , 0, SCMD_NE },

2
src/lists.h
View File

@@ -34,7 +34,7 @@ struct iterator_data {
/* Externals */ /* Externals */
extern struct list_data * global_lists; extern struct list_data * global_lists;
extern struct list_data * ticker_list; extern struct list_data * ticker_list;
extern int total_lists;
/* Locals */ /* Locals */
void add_to_list(void * pContent, struct list_data * pList); void add_to_list(void * pContent, struct list_data * pList);
void * random_from_list(struct list_data * pList); void * random_from_list(struct list_data * pList);

5
src/mud_event.c
View File

@@ -66,17 +66,14 @@ void attach_mud_event(struct mud_event_data *pMudEvent, long time)
switch (mud_event_index[pMudEvent->iId].iEvent_Type) { switch (mud_event_index[pMudEvent->iId].iEvent_Type) {
case EVENT_WORLD: case EVENT_WORLD:
add_to_list(pEvent, world_events); add_to_list(pEvent, world_events);
mudlog(CMP, LVL_GRGOD, TRUE, "INFO: Mud Event '%s' added to world", mud_event_index[pMudEvent->iId].event_name);
break; break;
case EVENT_DESC: case EVENT_DESC:
d = (struct descriptor_data *) pMudEvent->pStruct; d = (struct descriptor_data *) pMudEvent->pStruct;
add_to_list(pEvent, d->events); add_to_list(pEvent, d->events);
mudlog(CMP, LVL_GRGOD, TRUE, "INFO: Mud Event '%s' added to %s", mud_event_index[pMudEvent->iId].event_name, d->host ? d->host : "descriptor");
break; break;
case EVENT_CHAR: case EVENT_CHAR:
ch = (struct char_data *) pMudEvent->pStruct; ch = (struct char_data *) pMudEvent->pStruct;
add_to_list(pEvent, ch->events); add_to_list(pEvent, ch->events);
mudlog(CMP, LVL_GRGOD, TRUE, "INFO: Mud Event '%s' added to %s", mud_event_index[pMudEvent->iId].event_name, GET_NAME(ch));
break; break;
} }
} }
@@ -102,8 +99,6 @@ void free_mud_event(struct mud_event_data *pMudEvent)
struct descriptor_data * d; struct descriptor_data * d;
struct char_data * ch; struct char_data * ch;
mudlog(CMP, LVL_GRGOD, TRUE, "INFO: Freeing mud event '%s' : %d", mud_event_index[pMudEvent->iId].event_name, pMudEvent->iId);
switch (mud_event_index[pMudEvent->iId].iEvent_Type) { switch (mud_event_index[pMudEvent->iId].iEvent_Type) {
case EVENT_WORLD: case EVENT_WORLD:
remove_from_list(pMudEvent->pEvent, world_events); remove_from_list(pMudEvent->pEvent, world_events);