mirror of
https://github.com/tstellar/bygfoot.git
synced 2025-02-20 21:40:45 +01:00
"Segfixes."
This commit is contained in:
parent
adea7fb911
commit
fed7efad10
162
po/bygfoot.pot
162
po/bygfoot.pot
@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2005-06-15 18:41+0200\n"
|
||||
"POT-Creation-Date: 2005-06-15 21:10+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@ -209,36 +209,36 @@ msgid ""
|
||||
"Left-click: get loan; Right-click: pay back; Middle click: stadium window."
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:760
|
||||
#: src/cup.c:764
|
||||
msgid " -- Second leg"
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:762
|
||||
#: src/cup.c:766
|
||||
msgid " -- First leg"
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:765
|
||||
#: src/cup.c:769
|
||||
msgid " -- Replay matches"
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:777
|
||||
#: src/cup.c:781
|
||||
msgid "Round robin"
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:784
|
||||
#: src/cup.c:788
|
||||
#, c-format
|
||||
msgid "Last %d"
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:787
|
||||
#: src/cup.c:791
|
||||
msgid "Final"
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:790
|
||||
#: src/cup.c:794
|
||||
msgid "Semi-final"
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:793
|
||||
#: src/cup.c:797
|
||||
msgid "Quarter-final"
|
||||
msgstr ""
|
||||
|
||||
@ -268,7 +268,7 @@ msgstr ""
|
||||
msgid "Next week you'll fire him and hire a new one."
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:505
|
||||
#: src/game_gui.c:506
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The team owners have fired you because of financial mismanagement. Luckily, "
|
||||
@ -276,7 +276,7 @@ msgid ""
|
||||
"some information on %s:"
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:508
|
||||
#: src/game_gui.c:509
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The team owners have fired you because of unsuccessfulness. Luckily, the "
|
||||
@ -284,49 +284,49 @@ msgid ""
|
||||
"information on %s:"
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:511
|
||||
#: src/game_gui.c:512
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The owners of %s are deeply impressed by your success with %s and would like "
|
||||
"to hire you. Here's some information on %s:"
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:514
|
||||
#: src/game_gui.c:515
|
||||
msgid "Accept?"
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:516
|
||||
#: src/game_gui.c:517
|
||||
msgid " (NOTE: If you don't, the game is over for you.)"
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:567
|
||||
#: src/game_gui.c:568
|
||||
#, c-format
|
||||
msgid "Job offers set to %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:574
|
||||
#: src/game_gui.c:575
|
||||
#, c-format
|
||||
msgid "Live game set to %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:581
|
||||
#: src/game_gui.c:582
|
||||
#, c-format
|
||||
msgid "Overwrite set to %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:601
|
||||
#: src/game_gui.c:602
|
||||
msgid ""
|
||||
"Bygfoot is a very intuitive and simple game, so there isn't a full-grown "
|
||||
"documentation. However, if you have trouble, there are a few places to go.\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:603
|
||||
#: src/game_gui.c:604
|
||||
msgid ""
|
||||
"At the Bygfoot forums you can report bugs, ask for help and discuss the game "
|
||||
"(you don't have to register):\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/game_gui.c:605
|
||||
#: src/game_gui.c:606
|
||||
msgid ""
|
||||
"\n"
|
||||
"If you feel you've found out something about the game that has to be shared, "
|
||||
@ -1396,7 +1396,7 @@ msgstr ""
|
||||
msgid "Remove user %s from the game?"
|
||||
msgstr ""
|
||||
|
||||
#: src/misc2_interface.c:71 src/window.c:407
|
||||
#: src/misc2_interface.c:71 src/window.c:416
|
||||
msgid "Job offer"
|
||||
msgstr ""
|
||||
|
||||
@ -1434,7 +1434,7 @@ msgstr ""
|
||||
msgid "Average skill:"
|
||||
msgstr ""
|
||||
|
||||
#: src/misc2_interface.c:221 src/player.c:1063 src/treeview_helper.c:1083
|
||||
#: src/misc2_interface.c:221 src/player.c:1069 src/treeview_helper.c:1083
|
||||
msgid "OK"
|
||||
msgstr ""
|
||||
|
||||
@ -2016,52 +2016,52 @@ msgid ""
|
||||
"this user starts a new game)"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:956
|
||||
#: src/player.c:962
|
||||
#, c-format
|
||||
msgid "%s's contract expires in %.1f years."
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1066
|
||||
#: src/player.c:1072
|
||||
msgid "Concussion"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1069
|
||||
#: src/player.c:1075
|
||||
msgid "Pulled muscle"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1072
|
||||
#: src/player.c:1078
|
||||
msgid "Hamstring"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1075
|
||||
#: src/player.c:1081
|
||||
msgid "Groin injury"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1078
|
||||
#: src/player.c:1084
|
||||
msgid "Fractured ankle"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1081
|
||||
#: src/player.c:1087
|
||||
msgid "Broken rib"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1084
|
||||
#: src/player.c:1090
|
||||
msgid "Broken leg"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1087
|
||||
#: src/player.c:1093
|
||||
msgid "Broken ankle"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1090
|
||||
#: src/player.c:1096
|
||||
msgid "Broken arm"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1093
|
||||
#: src/player.c:1099
|
||||
msgid "Broken shoulder"
|
||||
msgstr ""
|
||||
|
||||
#: src/player.c:1096
|
||||
#: src/player.c:1102
|
||||
msgid "Torn crucial ligament"
|
||||
msgstr ""
|
||||
|
||||
@ -2070,77 +2070,77 @@ msgstr ""
|
||||
msgid "Couldn't find pixmap file: %s"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:492
|
||||
#: src/team.c:495
|
||||
msgid "ALL OUT DEFEND"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:494
|
||||
#: src/team.c:497
|
||||
msgid "DEFEND"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:496
|
||||
#: src/team.c:499
|
||||
msgid "BALANCED"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:498
|
||||
#: src/team.c:501
|
||||
msgid "ATTACK"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:500
|
||||
#: src/team.c:503
|
||||
msgid "ALL OUT ATTACK"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:507
|
||||
#: src/team.c:510
|
||||
msgid "ANTI"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:509
|
||||
#: src/team.c:512
|
||||
msgid "OFF"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:511
|
||||
#: src/team.c:514
|
||||
msgid "ON"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:970
|
||||
#: src/team.c:957
|
||||
#, c-format
|
||||
msgid "W %d : %d"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:975
|
||||
#: src/team.c:962
|
||||
#, c-format
|
||||
msgid "L %d : %d"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:979
|
||||
#: src/team.c:966
|
||||
#, c-format
|
||||
msgid "Dw %d : %d"
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:988
|
||||
#: src/team.c:975
|
||||
#, c-format
|
||||
msgid "%s (H) "
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:993
|
||||
#: src/team.c:980
|
||||
#, c-format
|
||||
msgid "<span background='%s' foreground='%s'>%s (A) </span> "
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:1002
|
||||
#: src/team.c:989
|
||||
#, c-format
|
||||
msgid "%s (N) "
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:1051
|
||||
#: src/team.c:1038
|
||||
msgid "Dw "
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:1054
|
||||
#: src/team.c:1041
|
||||
msgid "L "
|
||||
msgstr ""
|
||||
|
||||
#: src/team.c:1056
|
||||
#: src/team.c:1043
|
||||
msgid "W "
|
||||
msgstr ""
|
||||
|
||||
@ -2321,7 +2321,7 @@ msgstr ""
|
||||
msgid "PTS"
|
||||
msgstr ""
|
||||
|
||||
#: src/treeview.c:1221 src/window.c:251
|
||||
#: src/treeview.c:1221 src/window.c:260
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Improvement in progress.\n"
|
||||
@ -2616,26 +2616,26 @@ msgstr ""
|
||||
msgid "F"
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:243
|
||||
#: src/user.c:246
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The owners of %s are not satisfied with the recent performance of the team. "
|
||||
"There are rumours they're looking for a new manager."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:413
|
||||
#: src/user.c:416
|
||||
#, c-format
|
||||
msgid "%s has left your team because his contract expired."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:437
|
||||
#: src/user.c:440
|
||||
#, c-format
|
||||
msgid ""
|
||||
"You have overdrawn your bank account. The team owners give you %d weeks to "
|
||||
"get above your drawing credit limit."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:439
|
||||
#: src/user.c:442
|
||||
#, c-format
|
||||
msgid ""
|
||||
"You have overdrawn your bank account once again. Bear in mind that after the "
|
||||
@ -2643,141 +2643,141 @@ msgid ""
|
||||
"The team owners give you %d weeks to get above your drawing credit limit."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:443
|
||||
#: src/user.c:446
|
||||
#, c-format
|
||||
msgid "Have a look at the transfer list, there's an offer for %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:448
|
||||
#: src/user.c:451
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Your offer for %s has been accepted. If you still want to buy him, go to the "
|
||||
"transfer list and left click on the player."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:455
|
||||
#: src/user.c:458
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The owners of %s have rejected your offer (%s / %s) for %s. There was a "
|
||||
"better offer for the player than yours."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:461
|
||||
#: src/user.c:464
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The owners of %s have rejected your offer (%s / %s) for %s. Neither the fee "
|
||||
"nor the wage you offered were acceptable, they say."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:467
|
||||
#: src/user.c:470
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The owners of %s have rejected your offer (%s / %s) for %s. The team owners "
|
||||
"weren't satisfied with the fee you offered."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:473
|
||||
#: src/user.c:476
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s of %s has rejected your offer (%s / %s). He wasn't satisfied with the "
|
||||
"wage you offered."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:479
|
||||
#: src/user.c:482
|
||||
#, c-format
|
||||
msgid "You didn't have enough money to buy %s from %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:484
|
||||
#: src/user.c:487
|
||||
#, c-format
|
||||
msgid "Your roster is full. You couldn't buy %s from %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:507
|
||||
#: src/user.c:510
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s's injury was so severe that he can't play football on a professional "
|
||||
"level anymore. He leaves your team."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:510
|
||||
#: src/user.c:513
|
||||
msgid " Fortunately he's got a cousin who can help your team out."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:707
|
||||
#: src/user.c:710
|
||||
#, c-format
|
||||
msgid "You start the game with %s in the %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:712
|
||||
#: src/user.c:715
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s fires you because of financial mismanagement.\n"
|
||||
"You find a new job with %s in the %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:718
|
||||
#: src/user.c:721
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s fires you because of unsuccessfulness.\n"
|
||||
"You find a new job with %s in the %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:724
|
||||
#: src/user.c:727
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s offer you a job in the %s.\n"
|
||||
"You accept the challenge and leave %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:730
|
||||
#: src/user.c:733
|
||||
#, c-format
|
||||
msgid "You finish the season in the %s on rank %d."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:735
|
||||
#: src/user.c:738
|
||||
#, c-format
|
||||
msgid "You get promoted to the %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:739
|
||||
#: src/user.c:742
|
||||
#, c-format
|
||||
msgid "You get relegated to the %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:743
|
||||
#: src/user.c:746
|
||||
#, c-format
|
||||
msgid "You win the %s final against %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:748
|
||||
#: src/user.c:751
|
||||
#, c-format
|
||||
msgid "You lose in the %s final against %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:754
|
||||
#: src/user.c:757
|
||||
#, c-format
|
||||
msgid "You reach the %s (round %d) of the %s."
|
||||
msgstr ""
|
||||
|
||||
#: src/user.c:759
|
||||
#: src/user.c:762
|
||||
#, c-format
|
||||
msgid "You are champion of the %s!"
|
||||
msgstr ""
|
||||
|
||||
#: src/window.c:261
|
||||
#: src/window.c:270
|
||||
msgid "No improvements currently in progress."
|
||||
msgstr ""
|
||||
|
||||
#: src/window.c:329
|
||||
#: src/window.c:338
|
||||
#, c-format
|
||||
msgid "Welcome to Bygfoot %s"
|
||||
msgstr ""
|
||||
|
||||
#: src/window.c:385
|
||||
#: src/window.c:394
|
||||
msgid "Numbers..."
|
||||
msgstr ""
|
||||
|
||||
#: src/window.c:396
|
||||
#: src/window.c:405
|
||||
msgid "Your stadium"
|
||||
msgstr ""
|
||||
|
@ -23,8 +23,8 @@ bygfoot_SOURCES = \
|
||||
interface.c callbacks.h interface.h support.h \
|
||||
language.c callbacks.h free.h language.h misc.h option.h variables.h window.h \
|
||||
lg_commentary.c free.h lg_commentary.h live_game.h misc.h option.h player.h variables.h \
|
||||
league.c cup.h league.h maths.h misc.h option.h player.h stat.h table.h team.h user.h variables.h \
|
||||
live_game.c callbacks.h fixture.h free.h game.h game_gui.h lg_commentary.h live_game.h league.h maths.h misc_callback_func.h option.h player.h support.h team.h treeview.h user.h variables.h window.h \
|
||||
league.c cup.h league.h main.h maths.h misc.h option.h player.h stat.h table.h team.h user.h variables.h \
|
||||
live_game.c callbacks.h fixture.h free.h game.h game_gui.h lg_commentary.h live_game.h league.h main.h maths.h misc_callback_func.h option.h player.h support.h team.h treeview.h user.h variables.h window.h \
|
||||
load_save.c callbacks.h file.h game_gui.h gui.h load_save.h option.h support.h user.h variables.h xml_loadsave_misc.h xml_loadsave_cup.h xml_loadsave_league.h xml_loadsave_season_stats.h xml_loadsave_transfers.h xml_loadsave_users.h xml.h \
|
||||
main.c misc_callbacks.h file.h free.h language.h live_game.h main.h name_struct.h option.h stat_struct.h transfer_struct.h variables.h window.h \
|
||||
maths.c maths.h misc.h variables.h \
|
||||
@ -40,17 +40,17 @@ bygfoot_SOURCES = \
|
||||
option_gui.c callbacks.h file.h language.h game_gui.h option_gui.h option.h support.h treeview.h user.h variables.h \
|
||||
options_callbacks.c file.h options_callbacks.h options_interface.h option_gui.h support.h user.h variables.h window.h \
|
||||
options_interface.c options_interface.h options_callbacks.h support.h \
|
||||
player.c cup.h fixture.h free.h game_gui.h league.h maths.h misc.h name.h option.h player.h team.h user.h \
|
||||
player.c cup.h fixture.h free.h game_gui.h league.h main.h maths.h misc.h name.h option.h player.h team.h user.h \
|
||||
start_end.c cup.h file.h finance.h fixture.h free.h game_gui.h gui.h league.h load_save.h live_game.h main.h maths.h misc.h name.h option.h start_end.h stat.h table.h team.h transfer.h user.h variables.h xml_name.h \
|
||||
stat.c cup.h free.h league.h option.h player.h stat.h table_struct.h team.h variables.h \
|
||||
support.c support.h \
|
||||
table.c cup.h league.h table.h variables.h \
|
||||
team.c cup.h fixture.h game.h game_gui.h league.h maths.h misc.h option.h player.h team.h transfer.h user.h \
|
||||
team.c cup.h fixture.h game.h game_gui.h league.h main.h maths.h misc.h option.h player.h team.h transfer.h user.h \
|
||||
transfer.c cup.h finance.h free.h game_gui.h maths.h misc.h option.h player.h support.h team.h transfer.h treeview.h user.h \
|
||||
treeview.c cup.h finance.h fixture.h free.h game.h language.h league.h live_game.h maths.h misc.h player.h option.h support.h team.h transfer.h treeview.h treeview_helper.h user.h \
|
||||
treeview_helper.c cup.h file.h fixture.h free.h league.h misc.h option.h player.h support.h team.h transfer.h treeview.h treeview_helper.h user.h variables.h \
|
||||
user.c cup.h fixture.h free.h game_gui.h league.h live_game.h maths.h misc.h option.h player.h team.h transfer.h treeview.h user.h window.h \
|
||||
window.c file.h finance.h free.h game_gui.h gui.h interface.h league.h live_game.h main.h misc_interface.h misc2_interface.h option.h option_gui.h support.h transfer.h treeview.h treeview_helper.h user.h window.h \
|
||||
user.c cup.h fixture.h free.h game_gui.h league.h live_game.h main.h maths.h misc.h option.h player.h team.h transfer.h treeview.h user.h window.h \
|
||||
window.c callbacks.h file.h finance.h free.h game_gui.h gui.h interface.h league.h live_game.h main.h misc_interface.h misc2_interface.h option.h option_gui.h support.h transfer.h treeview.h treeview_helper.h user.h window.h \
|
||||
xml.c cup.h file.h free.h gui.h league.h misc.h option.h support.h table.h transfer_struct.h user.h variables.h xml.h xml_loadsave_cup.h xml_loadsave_fixtures.h xml_loadsave_league.h xml_loadsave_league_stat.h xml_loadsave_live_game.h xml_loadsave_table.h xml_loadsave_teams.h xml_loadsave_transfers.h xml_loadsave_users.h \
|
||||
xml_loadsave_cup.c cup.h file.h misc.h table.h team.h xml.h xml_loadsave_cup.h xml_loadsave_fixtures.h xml_loadsave_table.h xml_loadsave_teams.h \
|
||||
xml_loadsave_fixtures.c file.h fixture.h misc.h team.h xml.h xml_loadsave_fixtures.h \
|
||||
|
@ -79,6 +79,7 @@ enum ExitCodes
|
||||
EXIT_USER_FIRED, /**< Single user was fired and didn't accept the new offer. */
|
||||
EXIT_FIRST_WEEK_ERROR, /**< First week of cup was negative. */
|
||||
EXIT_OPTION_NOT_FOUND, /**< An option couldn't be found. */
|
||||
EXIT_POINTER_NOT_FOUND, /**< We didn't find a pointer needed. */
|
||||
EXIT_END
|
||||
};
|
||||
|
||||
|
@ -865,7 +865,12 @@ void
|
||||
on_menu_load_last_save_activate (GtkMenuItem *menuitem,
|
||||
gpointer user_data)
|
||||
{
|
||||
load_save_load_game("last_save");
|
||||
if(load_save_load_game("last_save"))
|
||||
{
|
||||
cur_user = 0;
|
||||
on_button_back_to_main_clicked(NULL, NULL);
|
||||
setsav1;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -723,6 +723,8 @@ cup_from_clid(gint clid)
|
||||
|
||||
g_warning("cup_from_clid: didn't find cup with id %d\n", clid);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -738,6 +740,8 @@ cup_from_sid(const gchar *sid)
|
||||
|
||||
g_warning("cup_from_sid: didn't find cup with sid %s \n", sid);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1087,6 +1087,8 @@ fixture_from_id(gint id)
|
||||
|
||||
g_warning("fixture_from_id: fixture with id %d found \n", id);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -469,7 +469,8 @@ game_gui_set_main_window_sensitivity(gboolean value)
|
||||
void
|
||||
game_gui_show_warning(gchar *text)
|
||||
{
|
||||
if(opt_int("int_opt_prefer_messages"))
|
||||
if(opt_int("int_opt_prefer_messages") &&
|
||||
window.main != NULL)
|
||||
game_gui_print_message(text);
|
||||
else
|
||||
{
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include "cup.h"
|
||||
#include "league.h"
|
||||
#include "main.h"
|
||||
#include "maths.h"
|
||||
#include "misc.h"
|
||||
#include "option.h"
|
||||
@ -116,6 +117,9 @@ league_from_clid(gint clid)
|
||||
return &lig(i);
|
||||
|
||||
g_warning("league_from_clid: didn't find league with id %d\n", clid);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include "game_gui.h"
|
||||
#include "lg_commentary.h"
|
||||
#include "live_game.h"
|
||||
#include "main.h"
|
||||
#include "maths.h"
|
||||
#include "misc_callback_func.h"
|
||||
#include "option.h"
|
||||
@ -1203,6 +1204,8 @@ live_game_unit_before(const LiveGameUnit* unit, gint gap)
|
||||
}
|
||||
}
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -134,7 +134,7 @@ load_save_save_game(const gchar *filename)
|
||||
}
|
||||
|
||||
/** Load the game from the specified file. */
|
||||
void
|
||||
gboolean
|
||||
load_save_load_game(const gchar* filename)
|
||||
{
|
||||
gchar buf[SMALL];
|
||||
@ -147,8 +147,6 @@ load_save_load_game(const gchar* filename)
|
||||
g_strndup(basename, strlen(basename) - strlen(const_str("string_save_suffix"))) :
|
||||
g_strdup(basename);
|
||||
|
||||
gtk_widget_hide(window.main);
|
||||
|
||||
if(g_str_has_suffix(filename, "last_save"))
|
||||
{
|
||||
g_free(basename);
|
||||
@ -162,13 +160,18 @@ load_save_load_game(const gchar* filename)
|
||||
{
|
||||
load_save_load_game(basename);
|
||||
g_free(basename);
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
g_warning("load_save_load_game: last save file not found.\n");
|
||||
|
||||
return;
|
||||
{
|
||||
game_gui_show_warning(_("Last save file not found."));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
if(window.main != NULL)
|
||||
gtk_widget_hide(window.main);
|
||||
|
||||
gui_show_progress(0, _("Uncompressing savegame..."));
|
||||
|
||||
file_decompress(fullname);
|
||||
@ -260,17 +263,15 @@ load_save_load_game(const gchar* filename)
|
||||
|
||||
gui_show_progress(-1, "");
|
||||
|
||||
gtk_widget_show(window.main);
|
||||
|
||||
setsav1;
|
||||
|
||||
cur_user = 0;
|
||||
on_button_back_to_main_clicked(NULL, NULL);
|
||||
if(window.main != NULL)
|
||||
gtk_widget_show(window.main);
|
||||
|
||||
g_free(basename);
|
||||
g_free(dirname);
|
||||
g_free(prefix);
|
||||
g_free(fullname);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/** Store the name of the last savegame in the users home dir. */
|
||||
|
@ -6,7 +6,7 @@
|
||||
void
|
||||
load_save_save_game(const gchar* filename);
|
||||
|
||||
void
|
||||
gboolean
|
||||
load_save_load_game(const gchar* filename);
|
||||
|
||||
void
|
||||
|
@ -234,7 +234,14 @@ misc_callback_improve_stadium(void)
|
||||
void
|
||||
misc_callback_startup_load(const gchar *filename)
|
||||
{
|
||||
window_destroy(&window.startup, TRUE);
|
||||
window_create(WINDOW_MAIN);
|
||||
load_save_load_game(filename);
|
||||
gtk_widget_hide(window.startup);
|
||||
|
||||
if(load_save_load_game(filename))
|
||||
{
|
||||
window_destroy(&window.startup, TRUE);
|
||||
window_create(WINDOW_MAIN);
|
||||
on_button_back_to_main_clicked(NULL, NULL);
|
||||
}
|
||||
else
|
||||
gtk_widget_show(window.startup);
|
||||
}
|
||||
|
10
src/player.c
10
src/player.c
@ -3,6 +3,7 @@
|
||||
#include "free.h"
|
||||
#include "game_gui.h"
|
||||
#include "league.h"
|
||||
#include "main.h"
|
||||
#include "maths.h"
|
||||
#include "misc.h"
|
||||
#include "name.h"
|
||||
@ -225,6 +226,9 @@ player_of_idx_team(const Team *tm, gint number)
|
||||
{
|
||||
g_warning("player_of_idx_team: Player list of team %s too short for number %d.\n",
|
||||
tm->name->str, number);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -247,6 +251,8 @@ player_of_id_team(const Team *tm, gint id)
|
||||
|
||||
g_warning("player_of_id_team: didn't find player with id %d of team %s\n", id, tm->name->str);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -1057,7 +1063,7 @@ player_injury_to_char(gint injury_type)
|
||||
{
|
||||
default:
|
||||
g_warning("player_injury_to_char: unknown type %d\n", injury_type);
|
||||
return NULL;
|
||||
return "";
|
||||
break;
|
||||
case PLAYER_INJURY_NONE:
|
||||
return _("OK");
|
||||
@ -1149,7 +1155,7 @@ player_get_last_name(const gchar *name)
|
||||
if(!g_utf8_validate(name, -1, NULL))
|
||||
{
|
||||
g_warning("player_get_last_name: invalid utf8-string: %s \n", name);
|
||||
return NULL;
|
||||
return "";
|
||||
}
|
||||
|
||||
temp = name;
|
||||
|
19
src/team.c
19
src/team.c
@ -3,6 +3,7 @@
|
||||
#include "game.h"
|
||||
#include "game_gui.h"
|
||||
#include "league.h"
|
||||
#include "main.h"
|
||||
#include "maths.h"
|
||||
#include "misc.h"
|
||||
#include "option.h"
|
||||
@ -222,6 +223,8 @@ team_of_id(gint id)
|
||||
|
||||
g_warning("team_of_id: team with id %d not found.", id);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -930,22 +933,6 @@ query_team_plays(const Team *tm, gint week_number, gint week_round_number)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/** Find the league team with the specified name. */
|
||||
Team*
|
||||
team_get_from_name(const gchar *name)
|
||||
{
|
||||
gint i, j;
|
||||
|
||||
for(i=0;i<ligs->len;i++)
|
||||
for(j=0;j<lig(i).teams->len;j++)
|
||||
if(strcmp(g_array_index(lig(i).teams, Team, j).name->str, name) == 0)
|
||||
return &g_array_index(lig(i).teams, Team, j);
|
||||
|
||||
g_warning("team_get_from_name: team with name %s not found.\n", name);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/** Show the results of the user team against the specified team.
|
||||
@param buf The buffer to fill with the results.
|
||||
@param sort Whether to sort the results according to home/away. */
|
||||
|
@ -132,9 +132,6 @@ team_get_average_skills(const GArray *teams);
|
||||
gboolean
|
||||
query_team_plays(const Team *tm, gint week_number, gint week_round_number);
|
||||
|
||||
Team*
|
||||
team_get_from_name(const gchar *name);
|
||||
|
||||
gint
|
||||
team_get_table_value(const Team *tm, gint type);
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include "game_gui.h"
|
||||
#include "league.h"
|
||||
#include "live_game.h"
|
||||
#include "main.h"
|
||||
#include "maths.h"
|
||||
#include "misc.h"
|
||||
#include "option.h"
|
||||
@ -222,6 +223,8 @@ user_from_team(const Team *tm)
|
||||
g_warning("User going with team %s not found.\n",
|
||||
tm->name->str);
|
||||
|
||||
main_exit_program(EXIT_POINTER_NOT_FOUND, "");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1,3 +1,4 @@
|
||||
#include "callbacks.h"
|
||||
#include "file.h"
|
||||
#include "finance.h"
|
||||
#include "free.h"
|
||||
@ -132,6 +133,14 @@ window_show_file_sel(void)
|
||||
else if(stat1 == STATUS_SAVE_GAME)
|
||||
load_save_save_game(filename);
|
||||
|
||||
if(stat1 == STATUS_LOAD_GAME ||
|
||||
stat1 == STATUS_LOAD_GAME_TEAM_SELECTION)
|
||||
{
|
||||
cur_user = 0;
|
||||
on_button_back_to_main_clicked(NULL, NULL);
|
||||
setsav1;
|
||||
}
|
||||
|
||||
g_free(filename);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user