Updated to work with gcc 5.X

1 files changed, 62 insertions, 82 deletions

diff --git a/ai.c b/ai.c
index 0a0936a..0f4b890 100644
--- a/ai.c
+++ b/ai.c
@@ -1,87 +1,67 @@
 #include "7w.h"
 
-int data_canafford(int p, int era, int card);
-int* data_gethand(int p);
-int data_numcards(int p);
-int data_getera();
-int data_getnext(int p); //next recipient of the hand
-int data_getdir(int dir, int p);
-int data_getwonderstages(int p);
-void data_discard(int p, int card);
-void data_build(int p, int card);
-void data_buildwonder(int p, int card);
-void data_addgold(int amnt, int p);
-int wonder_numstages(int player);
-int weight_buildcard(int era, int card, int player);
-int* weight_buildwonder(int player);
-int* cards_getproduction(int era, int card);
-int* cards_getcost(int era, int card);
-int data_hasbuiltname(int p, int era, int card);
-int* get_intarray(int size);
-int* ai_trade(int player, int era, int card);
-void write_trade(int player, int tradel, int trader);
-void arraycpy(int *from, int *to, int len);
-
-void ai_bestcard(int *hand, int player, int *ret)
-{
- int i, temp;
- int max = 0;
- int card = 0;
- int *trade = get_intarray(3);
- for(i = 0; i < 5; i++) ret[i] = 0;
- for(i = 0; hand[i] != -1 && i < 7; i++) {
-  trade[0] = trade[1] = trade[2] = 0;
-  temp = weight_buildcard(data_getera(), hand[i], player);
-  if(data_hasbuiltname(player, data_getera(), hand[i]))
-   temp = 0;
-  else if(data_canafford(player, data_getera(), hand[i]) != 1) {
-   trade = ai_trade(player, data_getera(), hand[i]);
-   if(trade[2]) temp -= trade[2] / 3;
-   else temp = 0;
-  }
-  if(temp > max) {
-   max = temp;
-   card = hand[i];
-   ret[2] = trade[0];
-   ret[3] = trade[1];
-   ret[4] = trade[2];
-  }
- }
- ret[0] = max;
- ret[1] = card;
+void ai_bestcard(int *hand, int player, int ret[2]) {
+	int i, temp;
+	int max = 0;
+	int card = 0;
+	int trade[3];
+	for (i = 0; i < 5; i++)
+		ret[i] = 0;
+	for (i = 0; hand[i] != -1 && i < 7; i++) {
+		trade[0] = trade[1] = trade[2] = 0;
+		temp = weight_buildcard(data_getera(), hand[i], player);
+		if (data_hasbuiltname(player, data_getera(), hand[i]))
+			temp = 0;
+		else if (data_canafford(player, data_getera(), hand[i]) != 1) {
+			ai_trade(player, data_getera(), hand[i], trade);
+			if (trade[2])
+				temp -= trade[2] / 3;
+			else
+				temp = 0;
+		}
+		if (temp > max) {
+			max = temp;
+			card = hand[i];
+			ret[2] = trade[0];
+			ret[3] = trade[1];
+			ret[4] = trade[2];
+		}
+	}
+	ret[0] = max;
+	ret[1] = card;
 }
 
-void ai_turn(int player)
-{
- int bestcard[5];
- int hand[7];
- arraycpy(data_gethand(player), hand, 7);
- int *wonder = get_intarray(4);
- wonder[0] = 0;
- int i;
- if(data_getwonderstages(player) < wonder_numstages(player))
-  wonder = weight_buildwonder(player);
- ai_bestcard(hand, player, bestcard);
- if(bestcard[0] > wonder[0] && bestcard[0] > 0) {
-  data_build(player, bestcard[1]);
-  for(i = 0; i < 2; i++) {
-   data_addgold(bestcard[2+i], data_getdir(i, player));
-  }
-  write_trade(player, bestcard[2], bestcard[3]);
-  data_addgold(bestcard[4] * -1, player);
-  return;
- }
- ai_bestcard(hand, data_getnext(player), bestcard);
- if(bestcard[0] == 0) bestcard[1] = hand[0];
- if(wonder[0] > 0) {
-  data_buildwonder(player, bestcard[1]);
-  for(i = 0; i < 2; i++) {
-   data_addgold(wonder[1+i], data_getdir(i, player));
-  }
-  write_trade(player, wonder[1], wonder[2]);
-  data_addgold(wonder[3] * -1, player);
-  return;
- }
- data_discard(player, bestcard[1]);
- data_addgold(3, player);
+void ai_turn(int player) {
+	int bestcard[5];
+	int hand[7];
+	data_gethand(player, hand);
+	int wonder[4];
+	wonder[0] = 0;
+	int i;
+	if (data_getwonderstages(player) < wonder_numstages(player))
+		weight_buildwonder(player, wonder);
+	ai_bestcard(hand, player, bestcard);
+	if (bestcard[0] > wonder[0] && bestcard[0] > 0) {
+		data_build(player, bestcard[1]);
+		for (i = 0; i < 2; i++) {
+			data_addgold(bestcard[2 + i], data_getdir(i, player));
+		}
+		write_trade(player, bestcard[2], bestcard[3]);
+		data_addgold(bestcard[4] * -1, player);
+		return;
+	}
+	ai_bestcard(hand, data_getnext(player), bestcard);
+	if (bestcard[0] == 0)
+		bestcard[1] = hand[0];
+	if (wonder[0] > 0) {
+		data_buildwonder(player, bestcard[1]);
+		for (i = 0; i < 2; i++) {
+			data_addgold(wonder[1 + i], data_getdir(i, player));
+		}
+		write_trade(player, wonder[1], wonder[2]);
+		data_addgold(wonder[3] * -1, player);
+		return;
+	}
+	data_discard(player, bestcard[1]);
+	data_addgold(3, player);
 }