rnd-20091030-1-src

* fixed (potential) compile error when using GCC option "-std=gnu99"
  (thanks to Tom "spot" Callaway)

diff --git a/ChangeLog b/ChangeLog
index 514c6ed8926bd8e46b2b056d35b71739683a5485..7ad0fba1081c58af55edd629506c74db6c0bea03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-30
+       * fixed (potential) compile error when using GCC option "-std=gnu99"
+         (thanks to Tom "spot" Callaway)
+
 2009-10-28
        * fixed array allocation in native Supaplex engine to correctly handle
          preceding scratch buffers (needed because of missing border checking)

diff --git a/src/conftime.h b/src/conftime.h
index 64d01167339912ce6ebff77543923f178ea200ba..32328865b2188c3a304cc81363e03d441493b5c3 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2009-10-28 15:07"
+#define COMPILE_DATE_STRING "2009-10-30 22:02"

diff --git a/src/game_sp/file.c b/src/game_sp/file.c
index 934f52f7e04e9d113288fe40014eb6597a32970e..12b52c3a24e7327aac681e8545e081e9e79e407d 100644 (file)
--- a/src/game_sp/file.c
+++ b/src/game_sp/file.c
@@ -129,7 +129,7 @@ void copyInternalEngineVars_SP()
   FreezeZonks = LInfo.InitialFreezeZonks;
 
 #if 1
-  /* set by main game tape code directly */
+  /* this is set by main game tape code to native random generator directly */
 #else
 
 #if 1
@@ -230,6 +230,7 @@ static void LoadNativeLevelFromFileStream_SP(FILE *file, boolean demo_available)
 
   /* random seed used for recorded demos */
   header->DemoRandomSeed = getFile16BitLE(file);       /* yes, little endian */
+  // header->DemoRandomSeed = getFile16BitBE(file);    /* !!! TEST ONLY !!! */
 
 #if 0
   printf("::: file.c: DemoRandomSeed == %d\n", header->DemoRandomSeed);

diff --git a/src/libgame/hash.h b/src/libgame/hash.h
index 0d20f2c42283475d7e4b7362343799c9102c1d8a..17e511e97fc1c28ceba78e819d632927cc467646 100644 (file)
--- a/src/libgame/hash.h
+++ b/src/libgame/hash.h
@@ -251,23 +251,16 @@ struct hashtable_itr *
 hashtable_iterator(struct hashtable *h);
 
 /*****************************************************************************/
-/* hashtable_iterator_key
- * - return the value of the (key,value) pair at the current position */
+/* key - return the key of the (key,value) pair at the current position */
 
-extern inline void *
-hashtable_iterator_key(struct hashtable_itr *i)
-{
-  return i->e->k;
-}
+void *
+hashtable_iterator_key(struct hashtable_itr *i);
 
 /*****************************************************************************/
 /* value - return the value of the (key,value) pair at the current position */
 
-extern inline void *
-hashtable_iterator_value(struct hashtable_itr *i)
-{
-  return i->e->v;
-}
+void *
+hashtable_iterator_value(struct hashtable_itr *i);
 
 /*****************************************************************************/
 /* advance - advance the iterator to the next element