/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
#ifndef XY_H
#define XY_H
-#include "sect.h"
-#include "nat.h"
+#include "types.h"
-/* Used to calculate an offset into an array. Used for
- dynamically sizing the world. */
-#define XYOFFSET(x, y) ((y * WORLD_X) + x)
+/* Return the number of sectors in the world */
+#define WORLD_SZ() (WORLD_X * WORLD_Y / 2)
-#define XNORM(x) (((x)<0) ? ((WORLD_X-(-(x)%WORLD_X))%WORLD_X) : ((x)%WORLD_X))
-#define YNORM(y) (((y)<0) ? ((WORLD_Y-(-(y)%WORLD_Y))%WORLD_Y) : ((y)%WORLD_Y))
+/* Fast version of sctoff() for normalized arguments */
+#define XYOFFSET(x, y) (((y) * WORLD_X + (x)) / 2)
+
+#define XNORM(x) \
+ (((x) < 0) ? (WORLD_X - 1 - ((-(x) - 1) % WORLD_X)) : ((x) % WORLD_X))
+#define YNORM(y) \
+ (((y) < 0) ? (WORLD_Y - 1 - ((-(y) - 1) % WORLD_Y)) : ((y) % WORLD_Y))
struct range {
coord lx; /* low-range x,y */