Permalink
Browse files

Fix function pointer types for breath weapons.

  • Loading branch information...
1 parent 0ebf40d commit 1de5bb69fc8f6b201591eea5a598bd5398cf0c6b @jonm committed Oct 12, 2015
Showing with 5 additions and 5 deletions.
  1. +2 −2 src/act.off.c
  2. +1 −1 src/protos.h
  3. +1 −1 src/spec_procs2.c
  4. +1 −1 src/structs.h
View
@@ -1231,7 +1231,7 @@ void do_wimp(struct char_data *ch, char *argument, int cmd)
extern struct breather breath_monsters[];
extern struct index_data *mob_index;
-void (*bweapons[])() = {
+void (*bweapons[])(byte, struct char_data *, char *, int, struct char_data *, struct obj_data *) = {
cast_geyser,
cast_fire_breath, cast_gas_breath, cast_frost_breath, cast_acid_breath,
cast_lightning_breath};
@@ -1241,7 +1241,7 @@ void do_breath(struct char_data *ch, char *argument, int cmd)
struct char_data *victim;
char buf[MAX_STRING_LENGTH], name[MAX_STRING_LENGTH];
int count, manacost;
- void (*weapon)();
+ void (*weapon)(byte, struct char_data *, char *, int, struct char_data *, struct obj_data *);
if (check_peaceful(ch,"That wouldn't be nice at all.\n\r"))
return;
View
@@ -1311,7 +1311,7 @@ struct breath_victim *choose_victims(struct char_data *ch,
struct char_data *first_victim);
void free_victims(struct breath_victim *head);
int breath_weapon(struct char_data *ch, struct char_data *target,
- int mana_cost, void (*func)());
+ int mana_cost, void (*func)(byte, struct char_data *, char *, int, struct char_data *, struct obj_data *));
int use_breath_weapon(struct char_data *ch, struct char_data *target,
int cost, void (*func)());
int BreathWeapon(struct char_data *ch, int cmd, char *arg, struct char_data *mob, int type);
View
@@ -2464,7 +2464,7 @@ void free_victims(struct breath_victim *head)
}
int breath_weapon(struct char_data *ch, struct char_data *target,
- int mana_cost, void (*func)())
+ int mana_cost, void (*func)(byte, struct char_data *, char *, int, struct char_data *, struct obj_data *))
{
struct breath_victim *hitlist, *scan;
struct char_data *tmp;
View
@@ -1424,7 +1424,7 @@ typedef void (*funcp)();
struct breather {
int vnum;
int cost;
- funcp *breaths;
+ void (*breaths[])(byte, struct char_data *, char *, int, struct char_data *, struct obj_data *);
};
struct figurine_data {

0 comments on commit 1de5bb6

Please sign in to comment.