Cleaned up.
authorFlorian Schulze <crow@icculus.org>
Wed, 13 Feb 2002 13:21:26 +0000 (13:21 +0000)
committerFlorian Schulze <crow@icculus.org>
Wed, 13 Feb 2002 13:21:26 +0000 (13:21 +0000)
main.c
menu.c

diff --git a/main.c b/main.c
index 970ea2c..17a0f3a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -276,17 +276,11 @@ char main(int argc, char *argv[])
                                                                                add_leftovers(1, 376, 34 + c1 * 64, s1 - (s1 / 10) * 10, number_gobs);
                                                                        }
                                                                } else {
-#if 0
-                                                                       player[c1].y = player[c2].y - (16L << 16);
-#endif
                                                                        if (player[c2].y_add < 0)
                                                                                player[c2].y_add = 0;
                                                                }
                                                        } else {
                                                                if (player[c2].y_add >= 0) {
-#if 0
-                                                                       player[c2].y = player[c1].y - (16L << 16);
-#endif
                                                                        player[c2].y_add = -player[c2].y_add;
                                                                        if (player[c2].y_add > -262144L)
                                                                                player[c2].y_add = -262144L;
@@ -319,9 +313,6 @@ char main(int argc, char *argv[])
                                                                                add_leftovers(1, 376, 34 + c2 * 64, s1 - (s1 / 10) * 10, number_gobs);
                                                                        }
                                                                } else {
-#if 0
-                                                                       player[c2].y = player[c1].y - (16L << 16);
-#endif
                                                                        if (player[c1].y_add < 0)
                                                                                player[c1].y_add = 0;
                                                                }
diff --git a/menu.c b/menu.c
index dc56933..efbc06a 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -348,9 +348,6 @@ char menu(void)
                                                        player[c1].frame = 0;
                                                        player[c1].frame_tick = 0;
                                                        player[c1].image = player_anims[player[c1].anim].frame[player[c1].frame].image + player[c1].direction * 9;
-#if 0
-                                                       dj_play_sfx(SFX_LAND, SFX_LAND_FREQ, 64, 0, 0, -1);
-#endif
                                                }
                                        }
                                } else {
@@ -362,9 +359,6 @@ char menu(void)
                                                        player[c1].frame = 0;
                                                        player[c1].frame_tick = 0;
                                                        player[c1].image = player_anims[player[c1].anim].frame[player[c1].frame].image + player[c1].direction * 9;
-#if 0
-                                                       dj_play_sfx(SFX_LAND, SFX_LAND_FREQ, 64, 0, 0, -1);
-#endif
                                                }
                                        }
                                }
@@ -442,12 +436,6 @@ char menu(void)
                        else
                                return 1;
                }
-#if 0
-               if (fade_flag == 2) {
-                       fade_dir = 0;
-                       fade_count = 0;
-               }
-#endif
                switch (fade_dir) {
                case 0:
                        if (fade_count < 30) {