From 19396e39e6bcc7d378a112bcbfc504c27eefb755 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 30 Nov 2014 04:56:09 +0000 Subject: [PATCH] Fix names of savegames. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4781 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 9 +++++++++ polymer/eduke32/source/menus.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 4df5eecb7..337af2c0c 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -8982,7 +8982,16 @@ FAKE_F3: g_screenCapture = 0; if (g_lastSaveSlot >= 0) + { + // dirty hack... char 127 in last position indicates an auto-filled name + if (ud.savegame[g_lastSaveSlot][MAXSAVEGAMENAME-2] == 127) + { + Bstrncpy(&ud.savegame[g_lastSaveSlot][0], MapInfo[ud.volume_number * MAXLEVELS + ud.level_number].name, 19); + ud.savegame[g_lastSaveSlot][MAXSAVEGAMENAME-2] = 127; + } + G_SavePlayerMaybeMulti(g_lastSaveSlot); + } } if (KB_UnBoundKeyPressed(sc_F7)) diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c index 2d13ddf15..7b29b2b2f 100644 --- a/polymer/eduke32/source/menus.c +++ b/polymer/eduke32/source/menus.c @@ -2620,7 +2620,7 @@ static int32_t M_MenuEntryStringSubmit(MenuEntry_t *entry, char *input) { case MENU_SAVE: // dirty hack... char 127 in last position indicates an auto-filled name - if (ud.savegame[M_SAVE.currentEntry][0] == 0 || (ud.savegame[M_SAVE.currentEntry][MAXSAVEGAMENAME-2] == 127 && + if (input[0] == 0 || (ud.savegame[M_SAVE.currentEntry][MAXSAVEGAMENAME-2] == 127 && save_xxh == XXH32((uint8_t *)&ud.savegame[M_SAVE.currentEntry][0], 19, 0xDEADBEEF))) { Bstrncpy(&ud.savegame[M_SAVE.currentEntry][0], MapInfo[ud.volume_number * MAXLEVELS + ud.level_number].name, 19);