54 lines
3.2 KiB
Diff
54 lines
3.2 KiB
Diff
|
Index: twind.c
|
||
|
|
===================================================================
|
||
|
|
--- twind.c.orig 2004-07-16 03:44:50.000000000 +0200
|
||
|
|
+++ twind.c 2014-09-08 17:04:00.111420759 +0200
|
||
|
|
@@ -674,10 +674,10 @@ int get_input_for_menu(char *menu_items[
|
||
|
|
if (event.button.x >= MENULX && event.button.x < MENURX && event.button.y >= starty && event.button.y < (starty + height)) {
|
||
|
|
current_menu_high = (event.button.y - starty) / game.font[font].height;
|
||
|
|
/* re-assign current_menu_high if blank option */
|
||
|
|
- if (menu_items[game.menu][current_menu_high] == "")
|
||
|
|
+ if (*menu_items[game.menu][current_menu_high] == '\0')
|
||
|
|
current_menu_high = game.last_menu_high;
|
||
|
|
if (game.last_menu_high != current_menu_high) {
|
||
|
|
- if (menu_items[game.menu][current_menu_high] != "") {
|
||
|
|
+ if (*menu_items[game.menu][current_menu_high] != '\0') {
|
||
|
|
#ifndef NOAUDIO
|
||
|
|
if (game.audio_enabled) Mix_PlayChannel(MENU_OPTION, game.sound[MENU_OPTION], 0);
|
||
|
|
#endif
|
||
|
|
@@ -697,7 +697,7 @@ int get_input_for_menu(char *menu_items[
|
||
|
|
if (event.button.x >= MENULX && event.button.x < MENURX && event.button.y >= starty && event.button.y < (starty + height)) {
|
||
|
|
current_menu_high = (event.button.y - starty) / game.font[font].height;
|
||
|
|
/* make sure the option isn't blank */
|
||
|
|
- if (menu_items[game.menu][current_menu_high] != "") {
|
||
|
|
+ if (*menu_items[game.menu][current_menu_high] != '\0') {
|
||
|
|
#ifndef NOAUDIO
|
||
|
|
if (game.audio_enabled) Mix_PlayChannel(OPTION_CHOICE, game.sound[OPTION_CHOICE], 0);
|
||
|
|
#endif
|
||
|
|
@@ -917,7 +917,7 @@ int move_in_menu(char *menu_items[][MAX_
|
||
|
|
#endif
|
||
|
|
current_menu_high--;
|
||
|
|
/* if option blank, go to previous */
|
||
|
|
- while (menu_items[game.menu][current_menu_high] == "")
|
||
|
|
+ while (*menu_items[game.menu][current_menu_high] == '\0')
|
||
|
|
current_menu_high--;
|
||
|
|
/* wrap around to the bottom entry */
|
||
|
|
if (current_menu_high == -1)
|
||
|
|
@@ -930,7 +930,7 @@ int move_in_menu(char *menu_items[][MAX_
|
||
|
|
#endif
|
||
|
|
current_menu_high++;
|
||
|
|
/* if option blank, go to next */
|
||
|
|
- while (menu_items[game.menu][current_menu_high] == "")
|
||
|
|
+ while (*menu_items[game.menu][current_menu_high] == '\0')
|
||
|
|
current_menu_high++;
|
||
|
|
/* wrap around to the top entry */
|
||
|
|
if (current_menu_high == game.menu_item_cnt)
|
||
|
|
@@ -1536,7 +1536,7 @@ void play_game() {
|
||
|
|
if (level_time && game.stop_timer + game.added_time < game.best_time)
|
||
|
|
game.best_time = game.stop_timer + game.added_time;
|
||
|
|
/* subtract a set amount of time after level 11 */
|
||
|
|
- if (game.current_level > 11)
|
||
|
|
+ if (game.current_level >= 11)
|
||
|
|
game.level_time -= 10;
|
||
|
|
else
|
||
|
|
game.level_time = times[level_time];
|