Index: TODO
==================================================================
--- TODO
+++ TODO
@@ -37,10 +37,11 @@
   * Large fonts (possibly: width 8 or 16, height 8-32)
   * Multibyte encodings (e.g. EUC-JP)
 * Branching replay recording
 * Slow movement displaying state between triggers
 * Warning if file changed when uncommited data exists in the cache database
+* Cache database option to be keyed by hash
 * Composite puzzle set format (implemented)
   * Optional hypertext help
   * Compressed class definitions (?)
 * Option to auto display level titles
 * Option to use a separate solution file

Index: comconfig.doc
==================================================================
--- comconfig.doc
+++ comconfig.doc
@@ -25,10 +25,14 @@
 
 CONFIG_NO_PORTABLE
   If defined, then portable mode by checking argv[0] is disabled. (It is
   still possible to use portable mode by HEROMESH_PREFIX)
 
+CONFIG_OMIT_SOUND
+  If defined, omit all sound capabilities (including music). (Even if it
+  is not defined, it can still be disabled at runtime.)
+
 CONFIG_USING_32BIT_TIMESTAMPS
   If defined, force use of 32-bit timestamps. (This is needed in order to
   avoid compiler warnings on some systems, such as some versions of the
   Raspberry Pi system. This option will be deprecated in year 2038, so
   you should upgrade your system before that if possible.)
@@ -65,14 +69,10 @@
 
 CONFIG_OMIT_MUSIC
   If defined, omit background music playback capabilities. (Even if this
   is not defined, it can still be disabled at runtime.
 
-CONFIG_OMIT_SOUND
-  If defined, omit all sound capabilities (including music). (Even if it
-  is not defined, it can still be disabled at runtime.)
-
 CONFIG_PRIVATE_USERCACHE
   If defined as a octal number, set the default file permissions of the
   user cache database when creating it. (The user can still change them
   afterward by using chmod.)
 

Index: sound.c
==================================================================
--- sound.c
+++ sound.c
@@ -12,10 +12,12 @@
 #include "smallxrm.h"
 #include "quarks.h"
 #include "heromesh.h"
 #include "cursorshapes.h"
 
+#ifndef CONFIG_OMIT_SOUND
+
 typedef struct {
   Uint8*data;
   Uint32 len; // length in bytes
 } WaveSound;
 
@@ -501,5 +503,14 @@
       case SDL_VIDEOEXPOSE: goto redraw;
       case SDL_QUIT: SDL_PushEvent(&ev); return;
     }
   }
 }
+
+#else
+// CONFIG_OMIT_SOUND is defined
+void init_sound(void) {}
+void set_sound_effect(Value v1,Value v2) {}
+Uint16 find_user_sound(const char*name) { return 0x03FF; }
+void set_sound_on(int on) {}
+void sound_test(void) {}
+#endif