Changeset 8

Timestamp:

11/13/09 19:06:37 (3 years ago)

Author:

David

Message:

Solves #112 and #113, along with some minor cleanups. See ChangeLog? for further details.

Location:

trunk

Files:

• ChangeLog (modified) (2 diffs)
• TODO (modified) (1 diff)
• enemy.cpp (modified) (1 diff)
• kobo.cpp (modified) (1 diff)
• sound.cpp (modified) (1 diff)

trunk/ChangeLog

@@ -4 +4 @@
         * Compact build options printout using define symbols.
         * Some TODO cleanup. (Moving to Trac tickets now.)
+        * Fixed PAN control in KOBO_sound::g_music(). It was sent
+          to the wrong group.
 
 Kobo Deluxe v0.5.1.1
@@ -29 +31 @@
         * Updated the COPYING (GPL license) file.
         * Updated all GPL/LGPL license headers.
-        * Added missing "one time only" macro logic to some headers.
+        * Added missing "once only" macro logic to some headers.
         * a_globals.[ch] changed from GPL to LGPLv2.1.
         * Removed unused file ptable.h.

trunk/TODO

@@ +1 @@
+*****************************************************************
+*                             NOTE!                             *
+*         This TODO is outdated and no longer updated!          *
+*       Check out the new issue tracking system over at         *
+*            http://beijingcode.org/projects/kobo               *
+*****************************************************************
+
 Pending updates and reports:
         * Apply joystick selection patch

trunk/enemy.cpp

@@ -30 +30 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Fast integer atan() approximation. Input is 24:8 fixed point.
-// Output is 0..64 for 0..45 deg, accurate accurate down to LSB.
+// Output is 0..64 for 0..45 deg, accurate down to LSB.
 //      In:     q = 256 * minv / maxv   (0..256 <==> 0..1)
 //      Out:    atan(q / 256) * 256     (0..64 <==> 0..45 deg)
 ///////////////////////////////////////////////////////////////////////////////
-// atan() approximations for 0..9 deg:
-//      a = 83 * q / 256 - q*q / 2844   (+/- 2.1%)
-//      a = 82 * q / 256 - k*k / 8500 - x*x*x / 1600000 (+/- 0.6%)
+// atan() approximations for 0..90 deg:
+//      a = 83 * q / 256 - q*q / 2844                           (+/- 2.1%)
+//      a = 82 * q / 256 - q*q / 8500 - q*q*q / 1600000         (+/- 0.6%)
+//
+// FIXME: Better version?
+//      a = 84 * q / 256 - 95 * q*q / 524288 - 8 * q*q*q / 16777216
 ///////////////////////////////////////////////////////////////////////////////
 static inline int fastatan(int q)

trunk/kobo.cpp

@@ -2189 +2189 @@
 #endif
                         "\n"
-#if 0
-                        "Build options:\n"
-#ifdef HAVE_DEBUG
-                        "    DEBUG\n"
-#endif
-#ifdef HAVE_OPENGL
-                        "    OpenGL\n"
-#endif
-#ifdef PROFILE_AUDIO
-                        "    Audio engine profiling\n"
-#endif
-#ifdef HAVE_OSS
-                        "    OSS audio support\n"
-#endif
-#ifdef HAVE_ALSA
-                        "    ALSA audio support\n"
-#endif
-#ifdef USE_MIDI
-                        "    MIDI input support\n"
-#endif
-#ifdef ENABLE_TOUCHSCREEN
-                        "    Touchscreen support\n"
-#endif
-#endif
                         "Copyright (c) 1995, 1996 Akira Higuchi\n"
                         "Copyright (C) 1997 Masanao Izumo\n"

trunk/sound.cpp

@@ -328 +328 @@
 {
         audio_channel_control(SOUND_GROUP_BGMUSIC, AVT_FUTURE, ACC_PATCH, wid);
-        audio_channel_control(SOUND_GROUP_UI, AVT_FUTURE, ACC_PAN, 0);
+        audio_channel_control(SOUND_GROUP_BGMUSIC, AVT_FUTURE, ACC_PAN, 0);
         audio_channel_play(SOUND_GROUP_BGMUSIC, 0, 60<<16, 65536);
 }