enable checker build.

remove getid aliases from parser.h

src/CMakeLists.txt

@@ -191,8 +191,8 @@ target_link_libraries(parser
   )
 
 
-#add_executable(checker ${CHECK_SRC})
-#target_link_libraries(checker parser)
+add_executable(checker ${CHECK_SRC})
+target_link_libraries(checker parser)
 
 add_library(game ${ERESSEA_SRC})
 target_link_libraries(game parser version)

src/checker.c

@@ -2,8 +2,9 @@
 #include <platform.h>
 #endif
 
+#include "util/parser.h"
+
 #include <stdio.h>
-#include "orderfile.h"
 
 int main(int argc, char **argv) {
     FILE * F = stdin;
@@ -14,7 +15,6 @@ int main(int argc, char **argv) {
             perror(filename);
             return -1;
         }
-        readorders(F);
         fclose(F);
     }
     return 0;

src/kernel/build.c

@@ -79,7 +79,7 @@ struct building *getbuilding(const struct region *r)
 
 ship *getship(const struct region * r)
 {
-    ship *sh, *sx = findship(getshipid());
+    ship *sh, *sx = findship(getid());
     for (sh = r->ships; sh; sh = sh->next) {
         if (sh == sx)
             return sh;

src/laws.c

@@ -1952,7 +1952,7 @@ int mail_cmd(unit * u, struct order *ord)
             }
 
         case P_FACTION:
-            n = getfactionid();
+            n = getid();
 
             for (u2 = r->units; u2; u2 = u2->next) {
                 if (u2->faction->no == n && seefaction(u->faction, r, u2, 0)) {

src/move.c

@@ -2265,7 +2265,7 @@ int follow_ship(unit * u, order * ord)
         return 0;
     }
 
-    id = getshipid();
+    id = getid();
 
     if (id <= 0) {
         cmistake(u, ord, 20, MSG_MOVE);
@@ -2549,7 +2549,7 @@ void follow_unit(unit * u)
                 }
             }
             else if (p == P_SHIP) {
-                id = getshipid();
+                id = getid();
                 if (id <= 0) {
                     /*	cmistake(u, ord, 20, MSG_MOVE); */
                 }

src/util/parser.h

@@ -33,9 +33,6 @@ extern "C" {
     int getid(void);
     unsigned int atoip(const char *s);
 
-#define getshipid() getid()
-#define getfactionid() getid()
-
 #ifdef __cplusplus
 }
 #endif