| version 1.66 | | version 1.67 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_plugins_c = | | * static char *rcsid_plugins_c = |
| * "$Id: plugins.c,v 1.66 2006/02/15 20:37:45 ryo_saeba Exp $"; | | * "$Id: plugins.c,v 1.67 2006/03/18 15:05:37 ryo_saeba Exp $"; |
| */ | | */ |
| | | |
| /*****************************************************************************/ | | /*****************************************************************************/ |
| | |
| { | | { |
| object* op2; | | object* op2; |
| op2 = va_arg(args, object*); | | op2 = va_arg(args, object*); |
| ri = CAN_MERGE(op, op2); | | ri = can_merge(op, op2); |
| rv = &ri; | | rv = &ri; |
| } | | } |
| *type = CFAPI_INT; | | *type = CFAPI_INT; |
| | |
| /* Note that find_plugin_command is called *before* the internal commands are*/ | | /* Note that find_plugin_command is called *before* the internal commands are*/ |
| /* checked, meaning that you can "overwrite" them. */ | | /* checked, meaning that you can "overwrite" them. */ |
| /*****************************************************************************/ | | /*****************************************************************************/ |
| CommArray_s *find_plugin_command(char *cmd, object *op) | | command_array_struct *find_plugin_command(char *cmd, object *op) |
| { | | { |
| int i; | | int i; |
| crossfire_plugin* cp; | | crossfire_plugin* cp; |
| CommArray_s* rtn_cmd; | | command_array_struct* rtn_cmd; |
| | | |
| if (plugins_list == NULL) | | if (plugins_list == NULL) |
| return NULL; | | return NULL; |