/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* combat.h: Definitions for things having to do with combat
- *
+ *
* Known contributors to this file:
* Ken Stevens, 1995
*/
#ifndef COMBAT_H
#define COMBAT_H
-#include "sect.h"
-#include "queue.h"
+#include "types.h"
+#include "ship.h"
struct combat {
int type; /* EF_BAD, EF_SECTOR, EF_SHIP, or EF_PLANE */
struct dchrstr *sct_dcp;
struct mchrstr *shp_mcp;
struct lchrstr *lnd_lcp;
- char shp_name[MAXSHPNAMLEN];
+ char shp_name[MAXSHPNAMLEN]; /* FIXME huh? pulls in ship.h */
int relations_checked;
};