sctoff2xy(): New, factored out of sct_oninit()

[empserver] / src / lib / common / filetable.c

diff --git a/src/lib/common/filetable.c b/src/lib/common/filetable.c
index b38a270f5dbf80c4536fe660b0fac6e9938fe807..8e0f50433f1158efd0625eb30268138bdac1c596 100644 (file)
--- a/src/lib/common/filetable.c
+++ b/src/lib/common/filetable.c
@@ -27,7 +27,7 @@
  *  filetable.c: Empire game data file descriptions.
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2005-2012
+ *     Markus Armbruster, 2005-2013
  */
 
 #include <config.h>
@@ -281,8 +281,7 @@ sct_oninit(void *ptr)
 {
     struct sctstr *sp = (struct sctstr *)ptr;
 
-    sp->sct_y = sp->sct_uid * 2 / WORLD_X;
-    sp->sct_x = sp->sct_uid * 2 % WORLD_X + sp->sct_y % 2;
+    sctoff2xy(&sp->sct_x, &sp->sct_y, sp->sct_uid);
     sp->sct_dist_x = sp->sct_x;
     sp->sct_dist_y = sp->sct_y;
     sp->sct_newtype = sp->sct_type = SCT_WATER;